Correct ChangeLog merge from stable

bk: 4b331b50A3D4efkV1f-d0I4gfjpCqA

diff --git a/ChangeLog b/ChangeLog
index 30b1c8de470203fffadada3636e262c1504671ca..264c47448c76476824647e6cff053a3ac2a31a7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [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.7p3) 2009/12/22 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1426] scripts/VersionName needs . on the search path.
 * [Bug 1427] quote missing in ./build - shows up on NetBSD.