Merge pogo:/usa/kardel/main-line/ntp-dev-1337

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

bk: 4ad25a883o7mbGrv5t1s9fXvPH02oA

diff --cc ChangeLog
index f0cd98cfcd6292e4f5b222aaf4e922ccab77ffc3,3c010f201723cd6765b6370b91bec71cd50eaff9..92af75dd43a677fd39304b7bb4f3828308c37166
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 -* [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...)
 +* [Bug 1302] OpenSSL under Windows needs applink support.
++* [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...).
 +* 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>