From: Dave Hart <hart@ntp.org>
Date: Wed, 15 Dec 2010 20:30:39 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1751
X-Git-Tag: NTP_4_2_7P95~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3be3945ca51592a3d9849d8bc733d8745954f80e;p=thirdparty%2Fntp.git

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

bk: 4d09256fND42Sk2wprl6gj9RUy2x7Q
---

3be3945ca51592a3d9849d8bc733d8745954f80e