Merge psp-fb1.ntp.org:/home/mayer/ntp-dev-headers

into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4b38389b1EcCrhIy1wzMIFyuLnj34g

diff --cc ChangeLog
index c2901bf4f5fd4bcb4a040ca7fecb482edc28ffbf,824f467dc21825a25d925715ecc2985cd0fc1fcd..4676c3c4d436bc6cc7443ef41f72db84db33f4f3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,7 @@@
+ * [Bug 1443] Remove unnecessary dependencies on ntp_io.h
+ * [Bug 1442] Move Windows functions into libntp files
  * Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify().
 +* Include (4.2.6p1-RC3) - [Bug 1439] .texi gen after binary is linked.
  * Include (4.2.6p1-RC3) - [Bug 1440] Update configure.ac to support kfreebsd.
  (4.2.7p5) 2009/12/25 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.6p1-RC2)