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

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

bk: 4b29fa4e85YujGs4AGyPFzrsTN03Dw

diff --cc ChangeLog
index 88d47cdd0b825ffef6f24b2ec9256e2142146a79,c5f2456410e4a9bc76bf9fd949c776e0ceb10e23..cff2527ecf186eddf2316a5df907ce14229d8062
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,6 +1,9 @@@
  ---
  
 +* [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.
 +* Build infrastructure updates to enable beta releases of ntp-stable.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>