Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1675-win-keyword

into  psp-deb1.ntp.org:/home/stenn/ntp-dev-1571-2

bk: 4cc3da9ebcM8TCVfw4TKouEI3Jluhg

diff --cc ChangeLog
index 642e0b75b65d1220633e017a70797587d7980cc3,4ca07be0494c286b75b8184c585bd20a8b85910f..962b95645bae98e28f139e4e259564285a7f936b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -421,7 -418,8 +421,9 @@@
  * [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
  ---
  
+ * [Bug 1571] NMEA does not relate data to PPS edge
+ * [Bug 1572] NMEA time adjustment for GPZDG buggy
 +* [Bug 1675] Prohibit includefile remote config.
  
  ---
  (4.2.6p3-RC5) 2010/10/22 Released by Harlan Stenn <stenn@ntp.org>