Merge dlh-7551.ad.hartbrothers.com:C:/ntp/ntp-dev-2140

into  dlh-7551.ad.hartbrothers.com:C:/ntp/ntp-dev-2143

bk: 4f42c6a8w2prcJ2AYkZ-XkGWTWVZBA

diff --cc ChangeLog
index 35c405193ca8a4729d901200123afa0222dae296,f072053186b824e5f2bb980ebb2efdf497ad0f4b..3e8f87f2b3ebc8bf5c96ca1d1d4d0131e6313a9d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
 +* [Bug 2140] Rework of Windows I/O completion port handling to avoid
 +  garbling serial input in UNIX line discipline emulation.
+ * [Bug 2143] NMEA 4.2.7p204 uses timecodes indicating lost reception.
+ * Increase detail in clockstats for NMEA driver (from Hal Murray).
  (4.2.7p257) 2012/02/17 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2135] defer calls to 'io_input' to main thread under Windows.
  (4.2.7p256) 2012/02/08 Released by Harlan Stenn <stenn@ntp.org>