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

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

bk: 49f2c620uuqVE3B-HNSNI-RcST3YxA

diff --cc ChangeLog
index 53600270218e1ee50656cf7d701f994dfdb37012,9b504e5df725e2006bd558af694439fae1b5ccb7..88b528edc0e907828a7fb9ad8a0b6dc93248185d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,13 +1,16 @@@
+ * [Bug 1165] Clean up small memory leaks in the  config file parser
+ * Correct logconfig keyword declaration to MULTIPLE_ARG
+ * Enable filename and line number leak reporting on Windows when built
+   DEBUG for all the typical C runtime allocators such as calloc,
+   malloc, and strdup.  Previously only emalloc calls were covered.
+ * Add DEBUG-only code to free dynamically allocated memory that would
+   otherwise remain allocated at ntpd exit, to allow less forgivable
+   leaks to stand out in leaks reported after exit.
+ * Ensure termination of strings in ports/winnt/libisc/isc_strerror.c
+   and quiet compiler warnings.
 +* [Bug 1057] ntpdc unconfig failure
 +* [Bug 1161] unpeer AKA unconfig command for ntpq :config
 +* PPS and crypto cleanup in ntp_proto.c from Dave Mills.
  (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.

diff --cc include/ntpd.h
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_parser.y
Simple merge