Merge bk://maccarony/ntp-dev

into  pogo.udel.edu:/pogo/users/hart/ntp-dev-1330

bk: 4ac92588H4JvePtuakmAoS5psysYCw

diff --cc ChangeLog
index 986ee9c8c9b8a2b0c5b7cb64ca1430fb4a326b26,8d250ea3002f7cdea5b496ff80270e5783931c5e..6ef0a9e8d451f5ed2d41c71892b6d332f3b53aab
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,10 @@@
 +* [Bug 1330] disallow interface/nic rules when --novirtualips or
 +  --interface are used.
 +* Add test of ntpd --saveconfigquit fidelity using new complete.conf.
+ * Documentation updates from Dave Hart/Dave Mills.
  (4.2.5p226) 2009/10/04 Released by Harlan Stenn <stenn@ntp.org>
 -[Bug 1318] Allow multiple -g options on ntpd command line.
 -[Bug 1327] ntpq, ntpdc, ntp-keygen -d and -D should work with configure
 +* [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.