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

into  pogo.udel.edu:/pogo/users/murray/bug-1090

bk: 49f8d6c58Ib0WNLNGihagafaJZOXJg

diff --cc ChangeLog
index 7eab781d097969216ed80269eeea2da50d43f52e,f840c28de6423df21139358111b33a11f8d6a2e6..5bdbe5b3fbc801dd10190d0fe546ca7907fe4186
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,4 +1,18 @@@
 -* Fix refclock_hpgps for Bug 1090 (bogus leap seconds)
++* [Bug 1090] Fix bogus leap seconds in refclock_hpgps.
 +(4.2.5p168) 2009/04/29 Released by Harlan Stenn <stenn@ntp.org>
 +* Include (4.2.4p7-RC4)
 +* [Bug 1169] quiet compiler warnings
 +* Re-enable gcc -Wstrict-prototypes when not building with OpenSSL
 +* Enable gcc -Wstrict-overflow
 +* ntpq/ntpdc emit newline after accepting password on Windows
 +* Updates from Dave Mills:
 +* ntp-keygen.c: Updates.
 +* Fix the error return and syslog function ID in refclock_{param,ppsapi}.
 +* Make sure syspoll is within the peer's minpoll/maxpoll bounds.
 +* ntp_crypto.c: Use sign_siglen, not len. sign key filename cleanup.
 +* Bump NTP_MAXEXTEN from 1024 to 2048, update values for some field lengths.
 +* m4/ntp_lineeditlibs.m4: fix warnings from newer Autoconf
 +* Remove truncation of position (blanking) code in refclock_nmea.c
  (4.2.5p167) 2009/04/26 Released by Harlan Stenn <stenn@ntp.org>
  * Crypto cleanup from Dave Mills.
  (4.2.5p166) 2009/04/25 Released by Harlan Stenn <stenn@ntp.org>