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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-updatepoint-1412-13-14-18

bk: 4b29fa78MwxHd9bnnTvyO2TjYLNpVg

diff --cc ChangeLog
index cff2527ecf186eddf2316a5df907ce14229d8062,8eedd3ef6204aac7a9f87197ba74fdfd8254f91a..38fbc343f9c7b548507f7ac2983f52fe2b231e45
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,6 +1,10 @@@
  ---
  
 +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
 +* [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
 +* [Bug 1414] Enable "make distcheck" success with BSD make.
+ * [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
 +* Build infrastructure updates to enable beta releases of ntp-stable.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/Makefile.am
Simple merge