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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-lose-ldisc-clk

bk: 4d8996cdMkVbB8S7BOHT6reB9EP2kQ

diff --cc ChangeLog
index f2c6d0830c2af919c30d5aa6f2050f80abc599f9,a8ed8d81f7f2a72e6318a8d21956c211315960d9..d16d7c34701e72cffcc60af2f866133b1ec86162
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,9 @@@
 +* Remove kernel line discipline driver code for clk and chu, deprecate
 +  related LDISC_ flags, and remove associated ntpd code to decode the
 +  timestamps, remove clktest line discipline test program.
+ (4.2.7p142) 2011/03/21 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1844] ntpd 4.2.7p131 NetBSD, --gc-sections links bad executable.
+ * Fix "make distcheck" break in libevent/sample caused by typo.
  (4.2.7p141) 2011/03/20 Released by Harlan Stenn <stenn@ntp.org>
  * Add "ntpq -c iostats" similar to "ntpdc -c iostats".
  * Compare entire timestamp to reject duplicates in refclock_pps().