Merge bk://ntp.bkbits.com/ntp-dev

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

bk: 4a0975c8qAGcNwpM72OTf0wPs_IN7A

diff --cc ChangeLog
index ccada66479014bc4951991df6e507550cee7861c,ab82156a3f70480b4225ff6c6ff028ea03bb2a60..1138e745b5b013a7764bfb36c1b9350dc813bde5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,5 +1,13 @@@
+ * [Bug 1154] mDNS registration should be done later, repeatedly and only
+   if asked for. (second try for fix)
 +(4.2.5p175) 2009/05/12 Released by Harlan Stenn <stenn@ntp.org>
 +* Include (4.2.4p7-RC7)
 +* [Bug 1180] ntpd won't start with more than ~1000 interfaces
 +* [Bug 1182] Documentation typos and missing bits.
 +* [Bug 1183] COM port support should extend past COM3
 +* [Bug 1184] ntpd is deaf when restricted to second IP on the same net
 +* Clean up configure.ac NTP_CACHEVERSION interface, display cache
 +  version when clearing.  Fixes a regression.
  (4.2.5p174) 2009/05/09 Released by Harlan Stenn <stenn@ntp.org>
  * Stale leapsecond file fixes from Dave Mills.
  (4.2.5p173) 2009/05/08 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntpd.c
Simple merge