Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1339

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1302-37-9-keyword

bk: 4ad34d7bdFwBMJH_-5T7mMCewg391g

diff --cc ChangeLog
index 92af75dd43a677fd39304b7bb4f3828308c37166,ff79a630d16f46c690b846a955619957958426e3..25389b0bd3481ec8bc3716aa0d2f9d13ca1f10ed
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,4 +1,8 @@@
 +* [Bug 1302] OpenSSL under Windows needs applink support.
 +* [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...).
+ * [Bug 1339] Fix Windows-only ntp_strerror() infinite recursion.
 +* Construct ntpd keyword scanner finite state machine at compile time
 +  rather than at runtime, shrink entries from 40+ to 8 bytes.
  (4.2.5p231-RC) 2009/10/10 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1335] Broadcast client degraded by wildcard default change.
  (4.2.5p230-RC) 2009/10/09 Released by Harlan Stenn <stenn@ntp.org>