Merge pogo:/usa/murray/bug-1368

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

bk: 4af60343G5hZhFUl6d0uo6wkkj_0Dg

diff --cc ChangeLog
index ef95d0588ae7fcbe0fed82a3e46bec54c49539c1,3ed2cfb940975bd4063002b4e622599bedc96db8..c3ee48ca5c2b5561f6d4611796bd5bcaec51510c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
+ * [Bug 1366] ioctl(TIOCSCTTY, 0) fails on NetBSD *[0-2].* > 3.99.7.
 +* [Bug 1368] typos in libntp --without-crypto case
+ * CID 87 dead code in ntpq.c atoascii().
+ * Fix authenticated ntpdc, broken in p240.
  (4.2.5p241-RC) 2009/11/07 Released by Harlan Stenn <stenn@ntp.org>
  * html/authopt.html update from Dave Mills.
  * Remove unused file from sntp/Makefile.am's distribution list.