Merge bk://www.ntp.org/ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1468-69

bk: 4b6461600P1PKhTk7KSc8FszuublUw

diff --cc ChangeLog
index 250376378af6bdb9e483e7495bd305139c0274b5,519728e3d6300e8257d29fcfacbc7b607701a630..c707b7108ecc9062636bac2559eee65cf802c185
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
+ (4.2.7p12) 2010/01/30 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1468] 'make install' broken for root on default NFS mount.
 +* [Bug 1469] u_int32, int32 changes broke HP-UX 10.20 build.
  (4.2.7p11) 2010/01/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 47] Debugging and logging do not work after a fork.
  * [Bug 1010] getaddrinfo() could block and thus should not be called by