From: Dave Hart <hart@ntp.org>
Date: Fri, 8 Jan 2010 20:10:45 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1453
X-Git-Tag: NTP_4_2_7P8~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ffe66a03822658eac36fa27d182772c944dcd74;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1453
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-702-1451-53

bk: 4b479145SACCx_50U3-tH8LK4rnY_w
---

9ffe66a03822658eac36fa27d182772c944dcd74
diff --cc ChangeLog
index 102bf8f34,aea400316..94580798e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
 +* [Bug 702] ntpd service logic should use libopts to examine cmdline.
 +* Include (4.2.6p1-RC3) - [Bug 1451] sntp leaks KoD entry updating.
+ * Include (4.2.6p1-RC3) - [Bug 1453] Use $CC in config.cache filename.
  (4.2.7p7) 2009/12/30 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 620] ntpdc getresponse() esize != *rsize s/b size != *rsize.
  * [Bug 1446] 4.2.7p6 requires autogen, missing ntpd.1, *.texi, *.menu.