Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libevent-upstream

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libevent-20110831

Updates our copy of libevent to git master as of
148458e0a1fd25e167aa2ef229d1c9a70b27c3e9
(which is in-progress libevent 2.1 branch as of 2.0.14-stable)

bk: 4e5e650bORurGNm-YLO3JGUgHFYZoQ

diff --cc sntp/libevent/Makefile.am
Simple merge

diff --cc sntp/libevent/configure.in
Simple merge

diff --cc sntp/libevent/event.c
Simple merge

diff --cc sntp/libevent/http.c
Simple merge

diff --cc sntp/libevent/include/event2/event.h
Simple merge

diff --cc sntp/libevent/sample/http-server.c
Simple merge