Merge psp-deb1:/home/perlinger/ntp-dev-2135

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

bk: 4f3b0a8evIFUMp206SCjADC9BVPwFA

diff --cc ChangeLog
index 146936c98ce5b669b225f86883c937e54edf9c64,8c622a1c9fc9d7871f80e064ed5fd7316748aadc..26c8356ab8a7aac2dcb54106c6e8a0baa85a97df
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 -* [Bug 2135] defer calls to 'io_input' to main thread under Windows
++* [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>
 +* [Bug 2131] Set the system variable settimeofday only after clock step.
 +* [Bug 2134] --enable-C99-snprintf does not force rpl_snprintf use.
  (4.2.7p255) 2012/01/29 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 603] Only link with nlist()-related libraries when needed:
    More cleanup.