Merge bk://www.ntp.org/ntp-dev

into  pogo.udel.edu:/pogo/users/neal/neal.ntp-dev

bk: 47452d21qmRtvUVveZOfCmCKxWJs-A

diff --cc ChangeLog
index 36f1b7bad9293000d090da3e5ba1ecdd732466af,e56ebb909cabb2f8d4dc434231ca5dfa9894db3c..251e49dda86b172ac1dc1e876a3b57260b798d7b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,17 +1,18 @@@
 +* [Bug 960] spurious syslog:crypto_setup:spurious crypto command
+ * [Bug 964] Change *-*-linux* to *-*-*linux* to allow for uclinux.
+ * Changes from Dave Mills:
+   - ntp_util.c: cleanup.
+   - ntp_timer.c: watch the non-burst packet rate.
+   - ntp_request.c: cleanup.
+   - ntp_restrict.c: RES_LIMITED cleanup.
+   - ntp_proto.c: RES_LIMITED, rate bucktes, counters, overall cleanup.
+   - ntp_peer.c: disallow peer_unconfig().
+   - ntp_monitor.c: RES_LIMITED cleanup.
+   - ntp_loopfilter.c: poll interval cleanup.
+   - ntp_crypto.c: volley -> retry.  Cleanup TAI leap message.
+   - ntp_config: average and minimum are ^2 values.
+   - ntpdc: unknownversion is really "declined", not "bad version".
+   - Packet retry cleanup.
  * [Bug 961] refclock_tpro.c:tpro_poll() calls refclock_receive() twice.
  * [Bug 957] Windows only: Let command line parameters from the Windows SCM GUI
    override the standard parameters from the ImagePath registry key.

diff --cc ntpd/ntp_config.c
Simple merge