Merge bk://maccarony.ntp.org/ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1041-1196

bk: 4a175d54c0f3960Kd3-F4g9o5SjYXQ

diff --cc ChangeLog
index 271970d4282ab62d3d5b26739959c01579fd91cb,809590f01d39e68b1d66140a4b59c41b611bb33b..369233592dadf3357a572edbb44ecc2f02448a50
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,7 @@@
- * Bug [1041] manycastclient fails with 4.2.5p120.
- * Bug [1193] Compile error: conflicting types for emalloc.
- * Bug [1196] VC6 winsock2.h does not define SO_EXLUSIVEADDRUSE.
- * xmt -> aorg timestamp cleanup from Dave Mills, reported by Dave Hart.
 -* [Bug 1193] Compile error: conflicting types for emalloc
+ * [Bug 1041] xmt -> aorg timestamp cleanup from Dave Mills,
+   reported by Dave Hart.
++* [Bug 1193] Compile error: conflicting types for emalloc.
++* [Bug 1196] VC6 winsock2.h does not define SO_EXLUSIVEADDRUSE.
  * Leap/expire cleanup from Dave Mills.
  (4.2.5p178) 2009/05/21 Released by Harlan Stenn <stenn@ntp.org>
  * Provide erealloc() and estrdup(), a la emalloc().