From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 27 Dec 2009 06:59:48 +0000 (-0500)
Subject: merge cleanup
X-Git-Tag: NTP_4_2_7P6~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=241711ef4af8f3148ffb24528c6908b91f0c41ab;p=thirdparty%2Fntp.git

merge cleanup

bk: 4b3705e4BjmBR05HNGiy0URNmiXObg
---

diff --git a/ChangeLog b/ChangeLog
index 05e4bc05a..9c3620cf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify().
+* Include (4.2.6p1-RC3) - [Bug 1440] Update configure.ac to support kfreebsd.
 (4.2.7p5) 2009/12/25 Released by Harlan Stenn <stenn@ntp.org>
 * Include (4.2.6p1-RC2)
 (4.2.7p4) 2009/12/24 Released by Harlan Stenn <stenn@ntp.org>