From: Dave Hart <hart@ntp.org>
Date: Thu, 14 Apr 2011 23:29:39 +0000 (+0000)
Subject: Merge psp-os1:/home/hart/ntp-dev-libevent-upstream
X-Git-Tag: NTP_4_2_7P152~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d4c6523cdb688e73227d0fda4f292b9c54ad34;p=thirdparty%2Fntp.git

Merge psp-os1:/home/hart/ntp-dev-libevent-upstream
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libevent-20110414

bk: 4da783633mS46eeqAS6elrsQKj3OYw
---

83d4c6523cdb688e73227d0fda4f292b9c54ad34