Merge pogo:/usa/kardel/main-line/ntp-dev-1363

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

bk: 4af6bd71NHkESTmNI74t2ddR9qb4wQ

diff --cc ChangeLog
index c3ee48ca5c2b5561f6d4611796bd5bcaec51510c,84c3296c469acd8358a4c47e9900c7beec89e1b5..bb557b290df955d1c1e20874f33c0ae9c3d033cf
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,4 +1,8 @@@
+ * [Bug 1363] CID 92 clarify fallthrough case in clk_trimtsip.c
 +* [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.