From: Dave Hart <hart@ntp.org>
Date: Tue, 2 Feb 2010 01:31:28 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1470
X-Git-Tag: NTP_4_2_7P14~1^2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3244df253833dd1b84e8f7e3a40613435debdc87;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1470
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1470-71-72

bk: 4b6780703A5TFuN3kvlqemZ07vObpg
---

3244df253833dd1b84e8f7e3a40613435debdc87