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

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

bk: 4b2db255SJvQ43OJWnsDPVSDq3i8bg

diff --cc ChangeLog
index 03a0e68d95bc9e0716fff1978e6f4a0300b926ec,8ea1431145cb85e4ae05bf3615523bf9086947ae..639ddea1924600745839a2e66cf255533d2beda6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,9 +1,19 @@@
 +* [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 1409] Put refclock_neoclock4x.c under the NTP COPYRIGHT notice.
+   This should allow debian and other distros to add this refclock driver
+   in further distro releases.
+   Detect R2 hardware releases.
  * [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
  * [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
  * [Bug 1414] Enable "make distcheck" success with BSD make.