Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1451

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-702-1451-53

bk: 4b479127rlwg9TpL8zBcHJBc3FKE5w

diff --cc ChangeLog
index a404ac852f4c6d9cd19df6a96445847098844fd9,8e51d332b6470185e187cc6acf767a330c8aac81..102bf8f3406bcf2691aa53baf2b767c8b348f1cd
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 702] ntpd service logic should use libopts to examine cmdline.
+ * Include (4.2.6p1-RC3) - [Bug 1451] sntp leaks KoD entry updating.
  (4.2.7p7) 2009/12/30 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 620] ntpdc getresponse() esize != *rsize s/b size != *rsize.
  * [Bug 1446] 4.2.7p6 requires autogen, missing ntpd.1, *.texi, *.menu.