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

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

bk: 4deb6aadDro8tQFEvMfl59VHPDjj9w

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