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

into  pogo.udel.edu:/pogo/users/kamboj/new-config-bk-repo

bk: 464230f99M1LhkRFGWhUdWiem4DeJA

diff --cc ChangeLog
index 66dcc16c631fd53c0634b14c4a11cca9d30c1fa9,b68684c99d8fe989554e0310345fa2cf583497d0..68d53bc7c5609425f34372c574ea9b9af9f2e191
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
 +* New config file parsing code, from Sachin Kamboj.
+ * fuzz bit cleanup from Dave Mills.
+ * replay cleanup from Dave Mills.
  * [Bug 542] Tolerate missing directory separator at EO statsdir.
  * [Bug 812] ntpd should drop supplementary groups.
  * [Bug 815] Fix warning compiling 4.2.5p22 under Windows with VC6.

diff --cc libntp/systime.c
Simple merge