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

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

bk: 4b3319c9db0qXfH7KcmTOWwjK5i_tg

diff --cc ChangeLog
index c62b4e6c01ed923af792be31be10e38bdbf8b706,9b7f10885c948f211e04af684627fb0bd848a17a..1582ff76580ca8c658ce04f77bc932cd2ac4fd44
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -7,7 -7,7 +7,8 @@@
  * [Bug 1426] scripts/VersionName needs . on the search path.
  * [Bug 1427] quote missing in ./build - shows up on NetBSD.
  * [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h
 +* [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution.
+ * [Bug 1431] System headers must come before ntp headers in ntp_intres.c .
  
  ---
  (4.2.6p1-RC1) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntp_config.c
Simple merge