Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 6 Feb 2011 19:24:42 +0000 (20:24 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 6 Feb 2011 19:24:42 +0000 (20:24 +0100)

Trivial merge