Merge whimsy.udel.edu:/deacon/backroom/ntp-stable

into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4b37050dNkplVc9gRf29RGMZgrIpag

diff --cc ChangeLog
index 3c8c13ab62e4c25dfe17df88e1591eec08a580af,234c712de63beebf54edf8cdd1e0d991da275ddd..05e4bc05aa6130675fbe05ee8d1c114801c52b30
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,28 -1,11 +1,32 @@@
 +* Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify().
 +(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>
 +* [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.
 +* [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h
 +(4.2.7p2) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1419] ntpdate, ntpdc, sntp, ntpd ignore configure --bindir.
 +(4.2.7p1) 2009/12/15 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1348] ntpd Windows port should wait for sendto() completion.
 +* [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
 +* [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
 +(4.2.7p0) 2009/12/13 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
 +* [Bug 1414] Enable "make distcheck" success with BSD make.
 +(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".
  ---
- (4.2.6p1-RC2) 2009/12/25 Released by Harlan Stenn <stenn@ntp.org>
  
+ * [Bug 1440] Update configure.ac to support kfreebsd.
  * [Bug 1127] Properly check the return of X590_verify() - missed one.
+ 
+ ---
+ (4.2.6p1-RC2) 2009/12/25 Released by Harlan Stenn <stenn@ntp.org>
+ 
  * [Bug 1411] Fix status messages in refclock_oncore.c.
  * [Bug 1416] MAXDNAME undefined on Solaris 2.6.
  * [Bug 1419] ntpdate, ntpdc, sntp, ntpd ignore configure --bindir.

diff --cc configure.ac
Simple merge