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

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

bk: 4cfa036151Yz2GwqGnsEExjoFs4AEw

diff --cc ChangeLog
index f61bcae78c97a19739dc689dc0296d156928bbd8,779ec1639d41fdd9f09baed302f1e62741cd855d..26064b87112bbd7d23806086a079d52ce06a75b2
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
- * [Bug 1735] clocktime() aborts ntpd on bogus input.
 +* [Bug 1736] tos int, bool options broken in 4.2.7p66.
+ (4.2.7p88) 2010/12/02 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1735] 'clocktime()' aborts ntpd on bogus input
  (4.2.7p87) 2010/12/01 Released by Harlan Stenn <stenn@ntp.org>
  * from 4.2.6p3-RC12: Clean up m4 quoting in configure.ac, *.m4 files,
    resolving intermittent AC_LANG_PROGRAM possibly undefined errors.