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

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

bk: 45b3a8f0iKzdTJBfgS8k2lKgHfAd_w

diff --cc ChangeLog
index 790d23d4c172c54ad3671c4dba30ed3a660e26f9,762aed17dd2e920df878c67a2bb00450332c6504..ef77cfbaa9ee1dcb133ad86c2bf0e0ec96929477
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +* 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 760] The background resolver must be aware of the 'dynamic' keyword.
+ * [Bug 753] make union timestamp anonymous (Philip Prindeville).
+ * confopt.html: move description for "dynamic" keyword into the right section.
+ * pick the right type for the recv*() length argument.
  (4.2.4) Released by Harlan Stenn <stenn@ntp.org>
  * monopt.html fixes from Dave Mills.
  * [Bug 452] Do not report kernel PLL/FLL flips.

diff --cc include/parse.h
Simple merge

diff --cc ntpd/ntp_intres.c
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge