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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1042-1237-8-44

bk: 4a5828e8F_oNCv6g8ZTniaevP7xCYg

diff --cc ChangeLog
index 7954a5c6194322addf417ac2a79f1f5b4c72c6da,83c4fdbbd1fb186a09dd5093d9ed9a7e2457cd78..e677ba7c87330dd90c873be940701b60da192b15
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,6 +1,11 @@@
 -* Added restrict keyword "mssntp" for Samba4 DC operation, by Dave Mills.
 +* [Bug 1042] multicast listeners IPv4+6 ignore new interfaces.
 +* [Bug 1237] Windows serial code treat CR and LF both as line
 +  terminators.
 +* [Bug 1238] use fudge time2 for serial timecode offset in NMEA driver.
+ * [Bug 1242] Remove --enable-wintime, symmetric workaround is now
+   always enabled.
 +* [Bug 1244] NTP_INSIST(fd != maxactivefd) failure in intres child
++* Added restrict keyword "mssntp" for Samba4 DC operation, by Dave Mills.
  (4.2.5p186) 2009/07/08 Released by Harlan Stenn <stenn@ntp.org>
  * ntp_proto.c cleanup from Dave Mills.
  (4.2.5p185) 2009/07/01 Released by Harlan Stenn <stenn@ntp.org>