From: Dave Hart <hart@ntp.org>
Date: Tue, 5 May 2009 21:12:15 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1176
X-Git-Tag: NTP_4_2_5P172~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=445b3141392b96b2235557390097fe24da287a4f;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1176
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1171-3-6-cver

bk: 4a00abafvT2vEdvGsGcsn3ceAUZS8w
---

445b3141392b96b2235557390097fe24da287a4f