From: Dave Hart <hart@ntp.org>
Date: Fri, 15 Apr 2011 15:18:22 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev
X-Git-Tag: NTP_4_2_7P153~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dae99144aa0f0677335172b8acb4018f2ad3d2f1;p=thirdparty%2Fntp.git

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

bk: 4da861bee4s8UGn9xnzUcgAetbou-g
---

dae99144aa0f0677335172b8acb4018f2ad3d2f1