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

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

bk: 4a4432e3uGJhZHDiWIfsLGyQa_5iiw

diff --cc ChangeLog
index e5be57d3d526bd2acfc993c3e0205e5ede5b2cbc,8fece5a82374661b37c76184cb4a8b7e945a550e..3d5ad48f251d1e518ffaab961ced3ab9f5fe4fa7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,8 @@@
- * [Bg 1233] atom refclock fudge time1 sign flipped in 4.2.4p164.
+ * [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
 +(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.