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

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

bk: 4ac2fc70un0YpTopVuBxgm86-gHDtg

diff --cc ChangeLog
index e70f08a5b5dda76d7533c1b83d19694abf5ea6da,0e4ca484855378014a99e68e7192429b967d3ffb..2d8daf07c1e98f33d37838d67c9bc5b5dcb2c1b1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* authopt documentation changes from Dave Mills/Dave Hart.
+ * [Bug 1324] support bracketed IPv6 numeric addresses for restrict.
  (4.2.5p224) 2009/09/29 Released by Harlan Stenn <stenn@ntp.org>
  * Clockhop and documentation fixes from Dave Mills.
  * Remove "tos maxhop" ntp.conf knob.