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

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

bk: 4b247719H1r5ydOEqidlO7ASWnwUyg

diff --cc ChangeLog
index 6610385f01b1193bd5ca1d34984b512c4040288d,55bece3f088beec7c111ca05aa94c86fabd605ad..a55abb2dccc9cc2e71f6e1c6550e229b19950204
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,10 @@@
 +(4.2.7) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
 +
+ ---
+ 
+ * [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
+ 
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.4p8) - [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.

diff --cc configure.ac
Simple merge