Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 30 Jul 2011 17:59:49 +0000 (17:59 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 30 Jul 2011 17:59:49 +0000 (17:59 +0000)

Trivial merge