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

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

bk: 49f0d291FC1yALZJm-6s_9UtwEQNNg

diff --cc ChangeLog
index 1d054830c6645f63768aaf632de1e04e17df5112,617aef40112a81d603036f3db1a2abded3677d41..465bc4d389a89d3e6e4cb4bfcbf5ce5d68275d82
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 1057] ntpdc unconfig failure
+ (4.2.5p165) 2009/04/23 Released by Harlan Stenn <stenn@ntp.org>
  * WWVB refclock cleanup from Dave Mills.
  * Code cleanup: requested_key -> request_key.
  * [Bug 833] ignore whitespace at end of remote configuration lines