Merge branch 'stable-81x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-81x
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jul 2012 14:47:47 +0000 (16:47 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jul 2012 14:47:47 +0000 (16:47 +0200)

Trivial merge