Merge shiny.ad.hartbrothers.com:c:\ntp\ntp-dev-216

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-gone-dot-o-216-1148-1149

bk: 49db9731b1Nr701OePqu7oHyn7SvJQ

diff --cc ChangeLog
index b6ed9313ae8ceb2428ae7a4fd8e2a2a0507d6329,18405829c870b169379c98768f07f65aa4cc782b..a40385023f22c96eac9253080d22b1028ef8ffbb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,8 +1,11 @@@
+ * [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>
@@@ -211,8 -213,6 +216,9 @@@
  * More cleanup and changes from Dave Mills.
  * [Bug 980] Direct help to stdout.
  
++---
 +* [Sec 1149] Use SO_EXCLUSIVEADDRUSE on Windows
 +
  ---
  (4.2.4p7-RC1) 2009/03/30 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc ports/winnt/libntp/libntp.vcproj
Simple merge