From: Dave Hart <hart@ntp.org>
Date: Tue, 7 Dec 2010 09:00:50 +0000 (+0000)
Subject: Merge bk://bk2.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P91~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acf1aa684f47b1506c408b7069ca358d23e39104;p=thirdparty%2Fntp.git

Merge bk://bk2.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1732

bk: 4cfdf7c2Crg56CbXa6ICCP_LhkQZFw
---

acf1aa684f47b1506c408b7069ca358d23e39104
diff --cc ChangeLog
index d12b08dd5,062136225..f486e2162
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
 +* [Bug 1732] ntpd ties up CPU on disconnected USB device.
+ * [Bug 1742] form 4.2.6p3-RC12: Fix a typo in an error message in the
+   "build" script.
  (4.2.7p90) 2010/12/06 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1738] Windows ntpd has wrong net adapter name.
  * [Bug 1740] ntpdc -c reslist packet count wrongly treated as signed.