From: Dave Hart <hart@ntp.org>
Date: Wed, 23 Dec 2009 11:35:25 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1429
X-Git-Tag: NTP_4_2_7P4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=317733761023623fcf94256376d9e8a3e4102088;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1429
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1429

bk: 4b32007dIOUr-nyefLb9q4Oc7BiZuw
---

317733761023623fcf94256376d9e8a3e4102088