Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 3 Jul 2011 23:09:28 +0000 (23:09 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 3 Jul 2011 23:09:28 +0000 (23:09 +0000)

Trivial merge