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

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

bk: 45bd7b605jkiwmhp7JolyLn43PRl9w

diff --cc ChangeLog
index 88a8e5d42761de9ee1adb7318af033448d579a9f,b2e21ccf48e945b75b762347e00cd2c49c58f354..f18881d7826f042dcbeda0addef7c65f8c9c1152
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,6 +1,12 @@@
 +* [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 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.
  * [Bug 753] make union timestamp anonymous (Philip Prindeville).
  * confopt.html: move description for "dynamic" keyword into the right section.

diff --cc ntpd/ntp_io.c
Simple merge