From: Dave Hart <hart@ntp.org>
Date: Fri, 15 Apr 2011 11:38:17 +0000 (+0000)
Subject: Merge psp-os1:/home/hart/ntp-dev-libevent-upstream
X-Git-Tag: NTP_4_2_7P153~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0f5658a02e33eafde7d81054c7fca6edff16a65;p=thirdparty%2Fntp.git

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

bk: 4da82e29cQ0z90cSg4k6XSxH8oV09Q
---

d0f5658a02e33eafde7d81054c7fca6edff16a65