From: Dave Hart <hart@ntp.org>
Date: Sun, 13 Dec 2009 05:09:45 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1412
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e931f59fa88adc8f9430fe3ce7a44f5eb7e8928;p=thirdparty%2Fntp.git

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

bk: 4b247719H1r5ydOEqidlO7ASWnwUyg
---

3e931f59fa88adc8f9430fe3ce7a44f5eb7e8928
diff --cc ChangeLog
index 6610385f01,55bece3f08..a55abb2dcc
--- a/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.