Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 20 Sep 2011 20:51:51 +0000 (20:51 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 20 Sep 2011 20:51:51 +0000 (20:51 +0000)

Trivial merge