Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2059-66-68-69

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69

bk: 4ed4df48PN45Yox4s7grocG-1WCyPQ

diff --cc ChangeLog
index 6223f4eb1a99fdc603ba0b31845b3b340d3924f3,442c31487cb7d5c15eb9aa7aa2d1bcd114654a27..a5ec25b814e6b2580ba5c141d35de5c0b2cb7a1f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -6,10 -5,10 +6,12 @@@
  * [Bug 2068] ntpd sends nonprintable stratum 16 refid to ntpq.
  * [Bug 2069] broadcastclient, multicastclient spin up duplicate
    ephemeral associations without broadcastdelay.
 +* [Bug 2072] Orphan parent selection metric needs ntohl().
  * Exclude not-yet-determined sys_refid from use in loopback TEST12
-   (from David Mills).  
+   (from David Mills).
+ * Never send KoD rate limiting response to MODE_SERVER response.
+ 
 +
  ---
  (4.2.6p5-RC1) 2011/10/18 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc ntpd/ntp_proto.c
Simple merge