Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 7 May 2011 13:23:49 +0000 (13:23 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 7 May 2011 13:23:49 +0000 (13:23 +0000)

Trivial merge