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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-dnsretry

bk: 4a0416e33aRzAgMS4CfU3amCEdbdRg

diff --cc ChangeLog
index 189d2f7232202afc1c48fede4f46749cdc1fd5af,66c266efa10e3347cf68dde583f3f50b002a3478..a6870fb1461ccf8c9e21de0663923aec95a9f056
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,7 +1,17 @@@
+ ---
+ 
+ * [Bug 1178] Use prior FORCE_DNSRETRY behavior as needed at runtime
+ 
 +---
 +(4.2.4p7-RC6) 2009/05/08 Released by Harlan Stenn <stenn@ntp.org>
 +
 +* [Bug 784] Make --enable-linuxcaps the default when available
 +* [Bug 1179] error messages for -u/--user and -i lacking droproot
 +* Updated JJY reference clock driver from Takao Abe
 +* [Bug 1071] Log a message and exit before trying to use FD_SET with a
 +  descriptor larger than FD_SETSIZE, which will corrupt memory
 +* On corruption of the iface list head in add_interface, log and exit
 +
  ---
  (4.2.4p7-RC5) 2009/05/02 Released by Harlan Stenn <stenn@ntp.org>