Merge pogo:/usa/hart/ntp-dev-983-1243

into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4aaf3ef3it2VvKOjsKu3Z1p-6v11Hg

diff --cc ChangeLog
index b7d17162ab82ccef9c93f0a7c65e181e5cf17b1b,c22f9bff5552a3aa165aed74ce7187d60e03823e..d8c8041df4d8eae771dad6a2086b0418fac0bd7e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,6 +1,16 @@@
 +* [Bug 983] add interface [listen | ignore | drop] ... directive.
 +* [Bug 1243] MD5auth_setkey zero-fills key from first zero octet.
 +* [Bug 1295] leftover fix, do not crash on exit in free_config_trap()
 +  when "trap 1.2.3.4" is used without any further options.
 +* document interface (alias nic) and unpeer.
 +* Correct syntax error line & column numbers.
 +* CID 79: kod_init_kod_db() fails to fclose(db_s) in two error paths.
 +* CID 80: attempt to quiet Coverity false positive re: leaking "reason"
 +  in main().
 +* CID 81: savedconfig leaked in save_config().
+ * Documentation updates from Dave Mills.
+ * Make the code agree with the spec and the book (Dave Mills).
+ (4.2.5p211) 2009/09/14 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 663] respect ntpq -c and -p order on command line.
  * [Bug 1292] more VC6 unsigned __int64 workarounds.
  * [Bug 1296] Added Support for Trimble Acutime Gold.