Merge bk://bk2.ntp.org/ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1732

bk: 4cfdf7c2Crg56CbXa6ICCP_LhkQZFw

diff --cc ChangeLog
index d12b08dd52665385b7223a821a87bbf629f8ab27,062136225b84ade4e7605f00e70e88bc25d69706..f486e2162f9d0e53591fa3ca56673d7ef9abb68b
--- 1/ChangeLog
--- 2/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.