Merge bk://www.ntp.org/ntp-dev

into  malarky.udel.edu:/m/pogo/users/murray/tg2

bk: 4b2979d22g4INvKXxR_XsA5l4q2asQ

diff --cc ChangeLog
index d98eb4469cf8f9409a765f7e4b5fb8ed69c53217,8c6ab17997ad9d0387a9dbf76fafafee0496b552..b55bc7252621dee119f982ff99a5c20351366adb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,4 +1,11 @@@
+ * add util/tg2, a clone of tg that works on Linux, NetBSD, and FreeBSD
 +(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".
  

diff --cc configure.ac
Simple merge