Merge whimsy.udel.edu:/deacon/backroom/ntp-stable

into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 45d937291PR-5vp1IGwtdLUNueyn7A

diff --cc ChangeLog
index c68dcb3e079493e3cabd80d8c1af983ef14de2c6,8d2c5e3a6a65ca62f522133b868e0e74d8744ede..c1b880d03accb3b07e5657a76e21b9f675da648c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,5 +1,12 @@@
 +* [Bug 778] ntpd fails to lock with drift=+500 when started with drift=-500.
 +* [Bug 592] Trimble Thunderbolt GPS support.
 +* IRIG, CHU, WWV, WWVB refclock improvements from Dave Mills.
 +* [Bug 757] Lose ULONG_CONST().
 +* [Bug 756] Require ANSI C (function prototypes).
 +* codec (audio) and ICOM changes from Dave Mills.
 +\f
  (4.2.4p1) Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 776] Remove unimplemented "rate" flag from ntpdate.
  * [Bug 586] Avoid lookups if AI_NUMERICHOST is set.
  * [Bug 770] Fix numeric parameters to ntp-keygen (Alain Guibert).
  * [Bug 768] Fix io_setbclient() error message.

diff --cc ntpdate/ntpdate.c
Simple merge