Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 7 Sep 2010 21:01:12 +0000 (23:01 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 7 Sep 2010 21:01:12 +0000 (23:01 +0200)

Trivial merge