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

into  pogo.udel.edu:/pogo/users/utterback/ntp-dev-1154

bk: 49f00f9eDUCZRjXNEE0hxG0-5nvAQA

diff --cc ChangeLog
index 05c99b7175526144adcbeed8180619e95ce36fda,67ac0aab3ee1e458798906421e2bbd5d6abdc9df..20cabc814b59a4b118b8b2d054cc9ab89c021826
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,4 +1,16 @@@
+ * [Bug 1154] mDNS registration should be done later, repeatedly and only if asked for.
 +* [Bug 1028] Support for W32Time authentication via Samba.
 +* Mitigation and PPS/PPSAPI cleanup from Dave Mills.
 +* Documentation updates from Dave Mills.
 +* timepps-Solaris.h patches from Dave Hart.
 +(4.2.5p164) 2009/04/22 Released by Harlan Stenn <stenn@ntp.org>
 +* PPS/PPSAPI cleanup from Dave Mills.
 +* Documentation updates from Dave Mills.
 +* [Bug 1125] C runtime per-thread initialization on Windows
 +* [Bug 1152] temporarily disable refclock_parse, refclock_true until
 +  maintainers can repair build break from pps_sample()
 +* [Bug 1153] refclock_nmea should not mix UTC with GPS time
 +* [Bug 1159] ntpq overlap diagnostic message test buggy
  (4.2.5p163) 2009/04/10 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.5p162) 2009/04/09 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.