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

into  poog.il.thewrittenword.com:/home/stenn/ntp-dev

bk: 4b67e27es82YnO3o5e29l9ylAvYMrw

diff --cc ChangeLog
index bc645cb179eacd2bddaeb409610bc286d0d040de,2ce8fc73a2d247574e4837f188b81bf7368ce9c5..f2ba810856e0e53e03bd5a846b1e29f11f44829b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
- * [Bug 1467] Fix bogus rebuild of sntp/sntp.html.
 +* [Bug 1469] u_int32, int32 changes broke HP-UX 10.20 build.
+ (4.2.7p13) 2010/01/31 Released by Harlan Stenn <stenn@ntp.org>
+ * Include (4.2.6p1) - [Bug 1467] Fix bogus rebuild of sntp/sntp.html.
  (4.2.7p12) 2010/01/30 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1468] 'make install' broken for root on default NFS mount.
  (4.2.7p11) 2010/01/28 Released by Harlan Stenn <stenn@ntp.org>