Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 5 May 2011 21:16:34 +0000 (21:16 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 5 May 2011 21:16:34 +0000 (21:16 +0000)

Trivial merge