Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 29 Apr 2011 10:14:36 +0000 (10:14 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 29 Apr 2011 10:14:36 +0000 (10:14 +0000)

Trivial merge