Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 20 Aug 2011 12:11:15 +0000 (12:11 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 20 Aug 2011 12:11:15 +0000 (12:11 +0000)

Trivial merge