From: Dave Hart <hart@ntp.org>
Date: Thu, 24 Dec 2009 07:35:37 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_7P4~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26d62067747fdc972c33a720e535f230ad981852;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-stable
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1429

bk: 4b3319c9db0qXfH7KcmTOWwjK5i_tg
---

26d62067747fdc972c33a720e535f230ad981852
diff --cc ChangeLog
index c62b4e6c0,9b7f10885..1582ff765
--- a/ChangeLog
+++ b/ChangeLog
@@@ -7,7 -7,7 +7,8 @@@
  * [Bug 1426] scripts/VersionName needs . on the search path.
  * [Bug 1427] quote missing in ./build - shows up on NetBSD.
  * [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h
 +* [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution.
+ * [Bug 1431] System headers must come before ntp headers in ntp_intres.c .
  
  ---
  (4.2.6p1-RC1) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>