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

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

bk: 4ad512e9vVPgx5uUwbOspBQ2OGs8hw

diff --cc ChangeLog
index 9f264b2c3c3f43299566debe0e32125564c7b50a,4513b2ac2b56074d932785b5471d355826a47f6e..357bcfcb2c530119492d1722a5587cedd19ed386
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,4 +1,11 @@@
 +* [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.
+ * [Bug 1341] NMEA driver requires working PPSAPI #ifdef HAVE_PPSAPI.
 +* Construct ntpd keyword scanner finite state machine at compile time
 +  rather than at runtime, shrink entries from 40+ to 8 bytes.
 +* Update documentation for ntpq --old-rv, saveconfig, saveconfigdir,
 +  ntpd -I -L and -M, and interface/nic rules. (From Dave Hart)
  (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>