Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1518

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1503-04-18-22

bk: 4bc68716MRSCc7kSP7AbtVUgBDyiQw

diff --cc ChangeLog
index 88be0aa1e9594123d3fe1117784901214a1d2c97,47e7db3f88e3c3fee0d417c31f0515c1d8c67290..49f1c68ef696c1f3af45820b190c0f26122c4545
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,13 @@@
  ---
  
+ * [Bug 1503] Auto-enabling of monitor for "restrict ... limited" wrong.
+ * [Bug 1504] ntpdate tickles ntpd "discard minimum 1" rate limit if
+   "restrict ... limited" is used.
 +* [Bug 1518] Windows ntpd should lock to one processor more
 +  conservatively.
  
  ---
+ (4.2.6p1) 2010/04/09 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.6p1-RC6) 2010/03/31 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Bug 1514] Typo in ntp_proto.c: fabs(foo < .4) should be fabs(foo) < .4.