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

Trivial merge