Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 28 Aug 2011 07:49:19 +0000 (07:49 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 28 Aug 2011 07:49:19 +0000 (07:49 +0000)

Trivial merge