Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 18 Jul 2011 00:06:58 +0000 (00:06 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 18 Jul 2011 00:06:58 +0000 (00:06 +0000)

Trivial merge