Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 2 May 2011 19:52:33 +0000 (19:52 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 2 May 2011 19:52:33 +0000 (19:52 +0000)

Trivial merge