Merge shiny.ad.hartbrothers.com:C:\ntp\ntp-dev-nmea-ppsapi

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

bk: 4a442ba2q8PddWz62W5stlCY4VgTHg

diff --cc ChangeLog
index 755c07686262580d863de8b9c824ec1be4c8cb2f,56a76a550a813748c6fe5b8e4a859a5376ecf4c2..8fece5a82374661b37c76184cb4a8b7e945a550e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,6 +1,26 @@@
 -* NMEA refclock converted to use common PPSAPI code
++* [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.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.
 +* [Bug 1205] Add ntpd --usepcc and --pccfreq options on Windows
 +* [Bug 1215] unpeer by association ID
 +* [Bug 1225] Broadcast address miscalculated on Windows 4.2.5p180
 +* [Bug 1229] autokey segfaults in cert_install().
 +* Use a union for structs sockaddr, sockaddr_storage, sockaddr_in, and
 +  sockaddr_in6 to remove casts and enable type checking.  Collapse
 +  some previously separate IPv4/IPv6 paths into a single codepath.
 +(4.2.5p181) 2009/06/06 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1206] Required compiler changes for Windows
  * [Bug 1084] PPSAPI for ntpd on Windows with DLL backends
  * [Bug 1204] Unix-style refclock device paths on Windows

diff --cc ntpd/refclock_nmea.c
Simple merge

diff --cc ports/winnt/include/config.h
Simple merge