From: Dave Hart <hart@ntp.org>
Date: Thu, 24 Dec 2009 07:40:16 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1429
X-Git-Tag: NTP_4_2_7P4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ec13cf37b589690f57fa3f30be1484d99351eaa;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: 4b331ae0xgTSrzYP2OcnNUv8ucEMRw
---

5ec13cf37b589690f57fa3f30be1484d99351eaa