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

Trivial merge