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

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

bk: 46a43fb8fG0FOHqkYhsTscVlxFCX9w

diff --cc ChangeLog
index 8647ef58d0b8e8488ab70efe084017d40862dd88,289e2054e238986a0e4a01b2bc37045e385221ba..acc551052716ea52e0395257a37b773845ac6660
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,7 @@@
- * [Bug 629] Undo bug #629 fixes as they cause more problems than were  being solved
++* [Bug 629] Undo bug #629 fixes as they cause more problems than were  being
++  solved
+ * Changes from Dave Mills: in/out-bound data rates, leapsecond cleanup,
+   driftfile write cleanup, packet buffer length checks, documentation updates.
  * More assertion checks and malloc()->emalloc(), courtesy of Calysto.
  * [Bug 864] Place ntpd service in maintenance mode if using SMF on Solaris
  * [Bug 862] includefile nesting; preserve phonelist on reconfig.