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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1318-27

bk: 4ac6e83aozj_-i_63dmbsp1xLKKTXA

diff --cc ChangeLog
index 99f843c3ece4d16f5264f9dd374f86e50b7afa02,b0b4c2b06ced0e4c6265884fc2e35f2faa3df4d6..97b438c43e1de3842af3e7586f0c48e77b7e536d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,5 +1,10 @@@
 +[Bug 1318] Allow multiple -g options on ntpd command line.
 +[Bug 1327] ntpq, ntpdc, ntp-keygen -d and -D should work with configure
 +  --disable-debugging.
 +* Add ntpd --saveconfigquit <filename> option for future build-time
 +  testing of saveconfig fidelity.
+ * Clockhop and autokey cleanup from Dave Mills.
+ * Documentation updates from Dave Mills.
  (4.2.5p225) 2009/09/30 Released by Harlan Stenn <stenn@ntp.org>
  * authopt documentation changes from Dave Mills/Dave Hart.
  * [Bug 1324] support bracketed IPv6 numeric addresses for restrict.