From: Dave Hart <hart@ntp.org>
Date: Mon, 1 Feb 2010 18:26:59 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1471-72
X-Git-Tag: NTP_4_2_7P14~1^2~1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d6c4a84db10ecd7eccabc22e31639d55b0353cb;p=thirdparty%2Fntp.git

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

bk: 4b671cf30KDnnoXJTeOm_-DUWkpl5g
---

4d6c4a84db10ecd7eccabc22e31639d55b0353cb