Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1419

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1419

bk: 4b29b069ES9I6KkCWSaie2uWbOjjVQ

diff --cc ChangeLog
index d98eb4469cf8f9409a765f7e4b5fb8ed69c53217,d562840691ff11038f8fe7ff4dfcf338bfed448c..ec41b9c8c92d59652bdf7faceb5b88bebde2aac3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,6 +1,15 @@@
 +(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 1419] ntpdate, ntpdc, sntp, ntpd ignore configure --bindir.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>

diff --cc configure.ac
Simple merge

diff --cc ntpd/Makefile.am
Simple merge

diff --cc ntpdc/Makefile.am
Simple merge

diff --cc ntpq/Makefile.am
Simple merge

diff --cc sntp/Makefile.am
Simple merge