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

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

bk: 4b5c0c6cOOnP0N6_HHNYoTP8Yvyncw

diff --cc ChangeLog
index 83b300588db4c081439c8b83867d015639b8f94c,ac12d2890ad760a596394c48f5e2907ad2dcdefa..934a2a9af73ad07b69630da871cda660fcc39047
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,47 -1,10 +1,56 @@@
- * [Bug 1448] Some macros not correctly conditionally or absolutely defined
-   on Windows
- * [Bug 1449] ntpsim.h should be conditionally in ntp_config.c
- * [Bug 1450] Option to exclude warnings not unconditionally defined on Windows
++* Include (4.2.6p1-RC3) - Use TZ=UTC instead of TZ= when calling date in
++  scripts/mkver.in .
++* Include (4.2.6p1-RC3) - [Bug 1448] Some macros not correctly conditionally
++  or absolutely defined on Windows.
++* Include (4.2.6p1-RC3) - [Bug 1449] ntpsim.h in ntp_config.c should be used
++  conditionally.
++* Include (4.2.6p1-RC3) - [Bug 1450] Option to exclude warnings not
++  unconditionally defined on Windows.
 +(4.2.7p9) 2010/01/13 Released by Harlan Stenn <stenn@ntp.org>
 +(4.2.7p8) 2010/01/12 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 702] ntpd service logic should use libopts to examine cmdline.
 +* Include (4.2.6p1-RC3) - [Bug 1451] sntp leaks KoD entry updating.
 +* Include (4.2.6p1-RC3) - [Bug 1453] Use $CC in config.cache filename.
 +(4.2.7p7) 2009/12/30 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 620] ntpdc getresponse() esize != *rsize s/b size != *rsize.
 +* [Bug 1446] 4.2.7p6 requires autogen, missing ntpd.1, *.texi, *.menu.
 +(4.2.7p6) 2009/12/28 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1443] Remove unnecessary dependencies on ntp_io.h
 +* [Bug 1442] Move Windows functions into libntp files
 +* Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify().
 +* Include (4.2.6p1-RC3) - [Bug 1439] .texi gen after binary is linked.
 +* Include (4.2.6p1-RC3) - [Bug 1440] Update configure.ac to support kfreebsd.
 +* Include (4.2.6p1-RC3) - [Bug 1445] IRIX does not have -lcap or support
 +  linux capabilities.
 +(4.2.7p5) 2009/12/25 Released by Harlan Stenn <stenn@ntp.org>
 +* Include (4.2.6p1-RC2)
 +(4.2.7p4) 2009/12/24 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution.
 +* [Bug 1431] System headers must come before ntp headers in ntp_intres.c .
 +(4.2.7p3) 2009/12/22 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1426] scripts/VersionName needs . on the search path.
 +* [Bug 1427] quote missing in ./build - shows up on NetBSD.
 +* [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h
 +(4.2.7p2) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1419] ntpdate, ntpdc, sntp, ntpd ignore configure --bindir.
 +* [Bug 1421] 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".
  ---
  
+ * Use TZ=UTC instead of TZ= when calling date in scripts/mkver.in .
+ * [Bug 1448] Some macros not correctly conditionally or absolutely defined
+   on Windows.
+ * [Bug 1449] ntpsim.h in ntp_config.c should be used conditionally.
+ * [Bug 1450] Option to exclude warnings not unconditionally defined on Windows.
  * [Bug 1127] Properly check the return of X590_verify() - missed one.
  * [Bug 1439] .texi generation must wait until after binary is linked.
  * [Bug 1440] Update configure.ac to support kfreebsd.