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

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

bk: 4b26b100-A6UjM11qASIlE6A3FNORw

diff --cc ChangeLog
index 07eac66c778e479050a6caaa692d37332541480f,8eedd3ef6204aac7a9f87197ba74fdfd8254f91a..58295de6b6c4294ff399dc4245ef41b3da7c2782
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,6 +1,11 @@@
 +(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 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/Makefile.am
Simple merge