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

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

bk: 4ae66a26AE0qPczuahC1GoGXsVLczQ

diff --cc ChangeLog
index f4435aad82511165ac964e71beb6099ef8e7fb5d,9f79681ad1485ce396f252e8ec1d8e73dc0f30ba..9fdb19ba2a389579dd501034d0876837eddc3107
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,6 +1,15 @@@
 -* PPSAPI cleanup on ntpd/refclock_wwvb.c.
+ * Changes from Dave Mills.
+ * driver4.html updates from Dave Mills.
++* [Bug 1252] PPSAPI cleanup on ntpd/refclock_wwvb.c.
 +* [Bug 1354] libtool error building after bootstrap with Autoconf 2.64.
 +* Allow NTP_VPATH_HACK configure test to handle newer gmake versions.
 +* CIDs 94-99 make it more clearly impossible for sock_hash() to return
 +  a negative number.
 +* CID 105, 106 ensure ntpdc arrays are not overrun even if callers
 +  misbehave.
 +* CID 113 use va_end() in refclock_true.c true_debug().
 +* Get rid of configure tests for __ss_family and __ss_len when the more
 +  common ss_family and ss_len are present.
  (4.2.5p237-RC) 2009/10/26 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 610] NMEA support for using PPSAPI on a different device.
  * [Bug 1238] use only fudge time2 to offset NMEA serial timestamp.