Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 21 Oct 2010 17:05:35 +0000 (19:05 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 21 Oct 2010 17:05:35 +0000 (19:05 +0200)

Trivial merge