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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1348-1413-18

bk: 4b26b34aQTao91Tn1EE0OxqUPK20BQ

diff --cc ChangeLog
index 9a82454baea808c761647d71333022b1a996d102,a9b64a398b7e7099b083f916158587b5803e4577..373d111025f9c6cc2a2006f0b036f32f483cfe87
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
 +* [Bug 1348] ntpd Windows port should wait for sendto() completion.
 +* [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
+ * [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
  (4.2.7p0) 2009/12/13 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
  * [Bug 1414] Enable "make distcheck" success with BSD make.