Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1323

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1321-3

bk: 4ac01157RtkDNNBWVaibCmeDC5fr3w

diff --cc ChangeLog
index b04b299a6962e27b948ba34901a468991cb2db1e,6d120de2b3401760ba921092aaefdbfbaabcfb2b..66f6f52f2834e6a144d96d8e23e8a72f0c3549e7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
 +* [Bug 1321] build doesn't work if . isn't on $PATH.
+ * [Bug 1323] Implement "revoke #" to match documentation, deprecate
+   "crypto revoke #".
  (4.2.5p222) 2009/09/27 Released by Harlan Stenn <stenn@ntp.org>
  * Update libisc code using bind-9.6.1-P1.tar.gz, rearrange our copy to
    mirror the upstream layout (lib/isc/...), and merge in NTP-local