Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 6 Apr 2011 22:47:01 +0000 (00:47 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 6 Apr 2011 22:47:01 +0000 (00:47 +0200)

Trivial merge