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

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

bk: 4b2dc6cakSs3srLEeb4PGYHBsHfRpQ

diff --cc ChangeLog
index 639ddea1924600745839a2e66cf255533d2beda6,cb369a3ffceed3743e070bee5f6714e5fb341a56..8202cb551e469884c445c5643c75d2d565ff3ab7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,5 +1,15 @@@
 +* [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-RC1) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Bug 1409] Put refclock_neoclock4x.c under the NTP COPYRIGHT notice.
    This should allow debian and other distros to add this refclock driver