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

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

bk: 4bc6874bB9ulJQ0lOPDCXS1N-sb45g

diff --cc ChangeLog
index 49f1c68ef696c1f3af45820b190c0f26122c4545,8c7cbebfb0674eda5a12be7f55fe96ed2190c321..7bf49bcc58af7f731ae756ab6269eeeb47ed7eea
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,9 +1,15 @@@
  ---
  
 +* [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.
+ * [Bug 1522] Enable range syntax "trustedkey (301 ... 399)".
+ * Update html/authopt.html controlkey, requestkey, and trustedkey docs.
  
  ---
 +(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.