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

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

bk: 4b13799chGZzXhM4O-yo86Bay3zaUw

diff --cc ChangeLog
index 307ef2b6bbc212a346e09a3514ed6b0ae22c5f3e,7322dd9a0a5d6a3e18829bf2fbd28d82194d0c9d..03fbab7f95dbafe59f5f59304b418daf9a2ffae5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,9 @@@
 -* [Bug 1386] Deferred DNS doesn't work on NetBSD
+ * [Bug 761] internal resolver does not seem to honor -4/-6 qualifiers
 -*  Pass no_needed to ntp_intres as first part of fixing Bug 975.
 -*  Add --enable-force-defer-DNS to help debugging.
++* [Bug 1386] Deferred DNS doesn't work on NetBSD
 +* [Bug 1391] avoid invoking autogen twice for .c and .h files.
 +* [Bug 1397] shmget() refclock_shm failing because of file mode.
++* Pass no_needed to ntp_intres as first part of fixing [Bug 975].
++* Add ./configure --enable-force-defer-DNS to help debugging.
  (4.2.5p249-RC) 2009/11/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1400] An empty KOD DB file causes sntp to coredump.
  * sntp: documentation cleanup.