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

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

bk: 49f6a9b0DGEyOBmtvyzNT1qdEM-5TQ

diff --cc ChangeLog
index f29d8999fb1d637a1e56e611b8f0607125891d7d,f326f71b0a8ba60479e7462788015a5e601833c5..e4d7b5a043e5004a47c8c6b7aa8eb0b9f5844176
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,9 @@@
+ * [Bug 1169] quiet compiler warnings
+ * Re-enable gcc -Wstrict-prototypes when not building with OpenSSL
+ * Enable gcc -Wstrict-overflow
+ * ntpq/ntpdc emit newline after accepting password on Windows
 +(4.2.5p167) 2009/04/26 Released by Harlan Stenn <stenn@ntp.org>
 +* Crypto cleanup from Dave Mills.
  (4.2.5p166) 2009/04/25 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1165] Clean up small memory leaks in the  config file parser
  * Correct logconfig keyword declaration to MULTIPLE_ARG