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

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

bk: 4ecf6d2dVh8cqShWK4E_f4EXxWNBjg

diff --cc ChangeLog
index b81fa6d8d8dc6d37141b1d53731da0db2b11e459,338873b2973ce089e68f68def6e9c9ea95b98b45..c8434aae7b04324b9b0ef5e97e05371f1a18938d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,12 +1,14 @@@
  ---
  
 +* [Bug 2050] Orphan mode stratum counting to infinity.
+ * [Bug 2059] optional billboard column "server" does not honor -n.
+ * [Bug 2066] ntpq lopeers ipv6 "local" column overrun.
+ * [Bug 2068] ntpd sends nonprintable stratum 16 refid to ntpq.
+ * [Bug 2069] broadcastclient, multicastclient spin up duplicate
+   ephemeral associations without broadcastdelay.
+ * Exclude not-yet-determined sys_refid from use in loopback TEST12
+   (from David Mills).  
 +
  ---
  (4.2.6p5-RC1) 2011/10/18 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc ntpd/ntp_proto.c
Simple merge