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

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

bk: 4a4d7c0fxXQRrQ1ijSskKernzomMew

diff --cc ChangeLog
index 4d07fe48f5bd58ad6e7dd99333f13156f7e0a007,5dad2e62604fe8e88f8efe2b1664343119983b08..99df2734390afb655686e3c05d34f7ac1cf38d52
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,22 -1,4 +1,23 @@@
 -* [Bug 1042] multicast listeners IPv4+6 ignore new interfaces
++* [Bug 1042] multicast listeners IPv4+6 ignore new interfaces.
 +(4.2.5p185) 2009/07/01 Released by Harlan Stenn <stenn@ntp.org>
 +* Documentation updates from Dave Mills.
 +* [Bug 1234] convert NMEA driver to use common PPSAPI code.
 +* timepps-Solaris.h pps_handle_t changed from pointer to scalar
 +* Spectracom refclock added to Windows port of ntpd
 +* [Bug 1236] Declaration order fixed.
 +* Bracket private ONCORE debug statements with #if 0 rather than #ifdef DEBUG
 +* Delete ONCORE debug statement that is now handled elsewhere.
 +(4.2.5p184) 2009/06/24 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1233] atom refclock fudge time1 sign flipped in 4.2.5p164.
 +(4.2.5p183) 2009/06/23 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1196] setsockopt(SO_EXCLUSIVEADDRUSE) can fail on Windows 2000
 +  and earlier with WSAINVAL, do not log a complaint in that case.
 +* [Bug 1210] ONCORE driver terminates ntpd without logging a reason.
 +* [Bug 1218] Correct comment in refclock_oncore on /etc/ntp.oncore*
 +  configuration file search order.
 +* Change ONCORE driver to log using msyslog as well as to any
 +  clockstats file.
 +* [Bug 1231] ntpsnmpd build fails after sockaddr union changes.
  (4.2.5p182) 2009/06/18 Released by Harlan Stenn <stenn@ntp.org>
  * Add missing header dependencies to the ntpdc layout verification.
  * prefer.html updates from Dave Mills.

diff --cc ntpd/ntp_io.c
Simple merge