Merge branch 'libevent' of ssh://git.citadel.org/appl/gitroot/citadel into libevent
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 30 Jan 2011 14:29:59 +0000 (15:29 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 30 Jan 2011 14:29:59 +0000 (15:29 +0100)

Trivial merge