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

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

bk: 44a0ebc2ofHiluECUNNc4MLaLjAl_Q

diff --cc NEWS
index e5db2af180a8692b95b6622b8d5c230815c5933c,6a87f8e2b0046d58fa40c6ea62f2fee44e5a4c11..a96d33aa5087ef60b97f587b7b9173b946612d3a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,6 +1,9 @@@
 +* Dynamic interface scanning can now be done [Bug 637, 51?]
 +* Options processing now uses GNU AutoGen
 +\f
  (4.2.2)
+ * Resolve an ambiguity in the copyright notice
+ -
  * SNTP
  * Many bugfixes
  * Implements the current "goal state" of NTPv4