Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 12 May 2011 19:53:43 +0000 (19:53 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 12 May 2011 19:53:43 +0000 (19:53 +0000)

Trivial merge