Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 29 Jun 2011 22:48:54 +0000 (22:48 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 29 Jun 2011 22:48:54 +0000 (22:48 +0000)

Trivial merge