Merge branch 'libevent' of ssh://git.citadel.org/appl/gitroot/citadel into libevent