Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 2 Sep 2010 21:33:34 +0000 (23:33 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 2 Sep 2010 21:33:34 +0000 (23:33 +0200)

Trivial merge