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

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

bk: 45beadb9zbJFZGJog7SfZvcR-ZGgPg

diff --cc ChangeLog
index f18881d7826f042dcbeda0addef7c65f8c9c1152,b5da3aaf5c91df8fab73823e69e5c27a78071aac..1c10000f9cddecfd4bf30cf2b5ecc92b40c33098
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,5 +1,11 @@@
 +* [Bug 592] Trimble Thunderbolt GPS support
 +* IRIG, CHU, WWV 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 770] Fix numeric parameters to ntp-keygen (Alain Guibert).
  * [Bug 768] Fix io_setbclient() error message.
  * [Bug 765] Use net_bind_service capability on linux.
  * [Bug 760] The background resolver must be aware of the 'dynamic' keyword.

diff --cc util/ntp-keygen.c
Simple merge