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: 4ed1872dI0z02szgngNoWx0rmTKEEQ

diff --cc ChangeLog
index c8434aae7b04324b9b0ef5e97e05371f1a18938d,ce47bd3d46db4a680be80ebbe05ca0e33d2af824..6223f4eb1a99fdc603ba0b31845b3b340d3924f3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,7 +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.
+ * [Bug 2072] Orphan parent selection metric needs ntohl().
 +* 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