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

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

bk: 450c68d05Qsg1PMCT54sbQE8VB_UKg

diff --cc NEWS
index 939fe56cbdbed9c33150544bbd1d42eeac14e675,703b01dad0fa92ef06eab527d8e66a9f8a22f1d0..c29652c82dee63d98e22f0e5ffaddbe9b6bd1fc7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,9 -1,7 +1,13 @@@
 +* [Bug 342] Deprecate broken TRAK refclock driver
 +* [Bug 340] Deprecate broken MSF EES refclock driver
 +* Support separate PPS devices for PARSE refclocks
 +* [Bug 637, 51?] Dynamic interface scanning can now be done
 +* Options processing now uses GNU AutoGen
 +\f
+ (4.2.2p4) Released by Harlan Stenn <stenn@ntp.isc.org>
+  * [Bug 710] compat getnameinfo() has off-by-one error
+  * [Bug 690] Buffer overflow in Windows when doing DNS Lookups
+ 
  (4.2.2p3) Released by Harlan Stenn <stenn@ntp.isc.org>
   * Make the ChangeLog file cleaner and easier to read
   * [Bug 601] ntpq's decodeint uses an extra level of indirection

diff --cc libntp/ntp_rfc2553.c
Simple merge