Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 1 Dec 2010 21:25:57 +0000 (22:25 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 1 Dec 2010 21:25:57 +0000 (22:25 +0100)

Trivial merge