Merge whimsy.udel.edu:/deacon/backroom/ntp-dev

into  whimsy.udel.edu:/deacon/backroom/ntp-dev-hart

bk: 49ddbb5a8zJoeaxp6JxcprCnqMHTog

diff --cc ChangeLog
index 15ad95f1f04206aae6846f733926fa7fb3631edd,d5b4047dccdfa2cbf7526a51e4fa020922f05257..1b9b0fdfb757d48fc943a7555a6705ad378772b4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,5 +1,14 @@@
+ * Documentation updates from Dave Mills.
+ * Mitigation and PPS cleanup from Dave Mills.
 +* Include (4.2.4p7-RC2)
 +* [Bug 216] New interpolation scheme for Windows eliminates 1ms jitter
 +* remove a bunch of #ifdef SYS_WINNT from portable code
 +* 64-bit time_t cleanup for building on newer Windows compilers
 +* Only set CMOS clock during ntpd exit on Windows if the computer is
 +  shutting down or restarting.
 +* [Bug 1148] NMEA reference clock improvements
 +* remove deleted gsoc_sntp/utilities.o from repository so that .o build
 +  products can be cleaned up without corrupting the repository.
  (4.2.5p161) 2009/03/31 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.
  (4.2.5p160) 2009/03/30 Released by Harlan Stenn <stenn@ntp.org>
@@@ -226,18 -215,14 +230,17 @@@
  ---
  (4.2.4p7-RC1) 2009/03/30 Released by Harlan Stenn <stenn@ntp.org>
  
 +* [Bug 1131] UDP sockets should not use SIGPOLL on Solaris.
 +* build system email address cleanup
 +* [Bug 774] parsesolaris.c does not compile under the new Solaris
  * [Bug 873] Windows serial refclock proper TTY line discipline emulation
 -* [Bug 1117] Deferred interface binding under Windows works only 
 -  correctly if FORCE_DNSRETRY is defined
 +* [Bug 1014] Enable building with VC9 (in Visual Studio 2008,
 +  Visual C++ 2008, or SDK)
 +* [Bug 1117] Deferred interface binding under Windows works only correctly
 +  if FORCE_DNSRETRY is defined
  * [BUG 1124] Lock QueryPerformanceCounter() client threads to same CPU
 -* [Bug 1014] Enable building with VC9 (in Visual Studio 2008, Visual
 -  C++ 2008, or SDK)
 -* DPRINTF macro made safer, always evaluates to a statement and will
 -  not misassociate an else which follows the macro
 +* DPRINTF macro made safer, always evaluates to a statement and will not
 +  misassociate an else which follows the macro.
- >>>>>>>
  
  ---
  (4.2.4p6) 2009/01/08 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntp_timer.c
Simple merge