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

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

bk: 4b29f9d5VVIym6Gku-Yr_Zuzo5viOA

diff --cc ChangeLog
index 55bece3f088beec7c111ca05aa94c86fabd605ad,a0f8a12eed2bb5303643b4d11deda8c00219784d..4681bbb0d99a6670d086d7e92c2ef67614e10db9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,7 @@@
  ---
  
 +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
+ * Build infrastructure updates to enable beta releases of ntp-stable.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>