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

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

bk: 4b387843RoOUC_eSCTbH8boFZJiqMg

diff --cc ChangeLog
index 4676c3c4d436bc6cc7443ef41f72db84db33f4f3,a7f7d354ce7fe5cc2abbe5375d52267248631132..018603f51d826ce3b51d795d0cf9a8333b2451d4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,32 -1,8 +1,33 @@@
 +* [Bug 1443] Remove unnecessary dependencies on ntp_io.h
 +* [Bug 1442] Move Windows functions into libntp files
 +* Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify().
 +* Include (4.2.6p1-RC3) - [Bug 1439] .texi gen after binary is linked.
 +* 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>
 +* [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".
  ---
  
- * [Bug 1439] .texi generation must wait until after binary is linked.
+ * [Bug 1445] IRIX does not have -lcap or support linux capabilities.
  * [Bug 1440] Update configure.ac to support kfreebsd.
+ * [Bug 1439] .texi generation must wait until after binary is linked.
  * [Bug 1127] Properly check the return of X590_verify() - missed one.
  
  ---

diff --cc configure.ac
Simple merge