From: Dave Hart <hart@ntp.org>
Date: Sat, 10 Apr 2010 03:27:02 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518
X-Git-Tag: NTP_4_2_7P24~2^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a57615f7bda04b0e2c6100d1b583b4d434079dc8;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518-20-22

bk: 4bbff006mzJn1pCvHG6UAF9HwHnD7w
---

a57615f7bda04b0e2c6100d1b583b4d434079dc8