Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 7 Sep 2011 12:39:03 +0000 (12:39 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 7 Sep 2011 12:39:03 +0000 (12:39 +0000)

Trivial merge