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

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

bk: 4dab483aBR55HHA4crQ2bpL969fyEw

diff --cc ChangeLog
index 4c137bb25d3c6906a8a25f766e8c1924b692415e,b2ed92a37997bd1a16d20dae3b5e632e6c6a8459..7b074e5d3ba6f18ecd80e0b0e51ff1f8a6da65e6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
+ (4.2.7p154) 2011/04/17 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1887] DNS fails on 4.2.7p153 using threads.
 +* Fix leak in refclock_datum.c start failure path.
  (4.2.7p153) 2011/04/16 Released by Harlan Stenn <stenn@ntp.org>
  * A few more Coverity Scan cleanups.
  (4.2.7p152) 2011/04/15 Released by Harlan Stenn <stenn@ntp.org>