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

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

bk: 45c6ac7aHuDuy2pMh95xa9gdZ47nIg

diff --cc ChangeLog
index 1c10000f9cddecfd4bf30cf2b5ecc92b40c33098,65995326c51aec5ac104d2554345f04a3b73de12..0640668b56e5d9a7a1ba1ed305694347f944a1fb
--- 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 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.
  * [Bug 765] Use net_bind_service capability on linux.

diff --cc libntp/ntp_rfc2553.c
Simple merge

diff --cc ntpq/ntpq-subs.c
Simple merge