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

into  pogo.udel.edu:/pogo/users/mayer/ntp-stable-vc6

bk: 4b529046KwJ9P9hBXcnNjUpwKsqzKg

diff --cc ChangeLog
index c20660184a480a7253dc46c1bd438202f0757f25,efe4a56029f639ce64609a5760ab3a737a47d198..81c71df5b61395ad55cbae75db1f4ca512a31692
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,11 +1,15 @@@
 +* [Bug 1448] Some macros not correctly conditionally or absolutely defined
 +  on Windows
 +* [Bug 1449] ntpsim.h should be conditionally in ntp_config.c
 +* [Bug 1450] Option to exclude warnings not unconditionally defined on Windows
  ---
  
- * [Bug 1445] IRIX does not have -lcap or support linux capabilities.
- * [Bug 1440] Update configure.ac to support kfreebsd.
- * [Bug 1439] .texi generation must wait until after binary is linked.
  * [Bug 1127] Properly check the return of X590_verify() - missed one.
+ * [Bug 1439] .texi generation must wait until after binary is linked.
+ * [Bug 1440] Update configure.ac to support kfreebsd.
+ * [Bug 1445] IRIX does not have -lcap or support linux capabilities.
+ * [Bug 1451] CID 115: sntp leaks KoD entry when updating existing.
+ * [Bug 1453] Use $CC in config.cache filename in ./build script.
  
  ---
  (4.2.6p1-RC2) 2009/12/25 Released by Harlan Stenn <stenn@ntp.org>