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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1339-45-6-7

bk: 4ad8223fR4sXkVd6E7GXkppvIUFeKA

diff --cc ChangeLog
index fb05eed91c0030bf8a92b80b55bf25b9d73113e6,c8e2025db17ac48c12ed056ea17bf60f3b42ca40..be719e9fc6d110b260973788d425db5a32f2089f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,8 @@@
+ * [Bug 1339] redux, use unmodified lib/isc/win32/strerror.c and
+   move #define strerror... to a header not used by lib/isc code.
 +* [Bug 1345] illegal 'grep' option prevents compilation.
 +* [Bug 1346] keyword scanner broken where char defaults to unsigned.
 +* [Bug 1347] ntpd/complete.conf missing multicastclient test case.
  (4.2.5p233-RC) 2009/10/15 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1337] cast setsockopt() v4 address pointer to void *.
  * [Bug 1342] ignore|drop one IPv6 address on an interface blocks all