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

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

bk: 44c97520qQfIB1zOgLRG29OfLmrMYQ

diff --cc Makefile.am
Simple merge

diff --cc NEWS
index 20634e83bbf17b0678b42c3d77e8728b2d202c7e,d6f1a52d90db03d8e94e08346d0a80c9c59d4d83..11a0fecce7e9f596deb2d159d5d6f6a165646cda
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,26 +1,29 @@@
- * Dynamic interface scanning can now be done [Bug 637, 51?]
++* [Bug 637, 51?] Dynamic interface scanning can now be done
 +* Options processing now uses GNU AutoGen
 +\f
- (4.2.2)
+ (4.2.2p3)
+ * Make the ChangeLog file cleaner and easier to read
+ * [Bug 601] ntpq's decodeint uses an extra level of indirection
+ * [Bug 657] Different OSes need different sized args for IP_MULTICAST_LOOP
+ * release engineering/build changes
+ * Documentation fixes
+ * Get sntp working under AIX-5
+ (4.2.2p2) (broken)
  * Get sntp working under AIX-5
+ (4.2.2p1)
+ * [Bug 661] Use environment variable to specify the base path to openssl.
  * Resolve an ambiguity in the copyright notice
- -
+ * Added some new documentation files
+ * URL cleanup in the documentation
+ * [Bug 657]: IP_MULTICAST_LOOP uses a u_char value/size
+ * quiet gcc4 complaints
+ * more Coverity fixes
+ * [Bug 614] manage file descriptors better
+ * [Bug 632] update kernel PPS offsets when PPS offset is re-configured
+ * [Bug 637] Ignore UP in*addr_any interfaces
+ * [Bug 633] Avoid writing files in srcdir
+ * release engineering/build changes
+ (4.2.2)
  * SNTP
  * Many bugfixes
  * Implements the current "goal state" of NTPv4