Merge bk://maccarony/ntp-dev

into  pogo.udel.edu:/pogo/users/hart/ntp-dev-1470-71-72-73

bk: 4b67ed83TR0VEok1LaUGfWStMkmSIg

diff --cc ChangeLog
index f2ba810856e0e53e03bd5a846b1e29f11f44829b,0712f9036e8cc7e626e9526dae1be7f3531d28fe..c3d13b8d5e9daabb0b633ee30e6f053083f24cfb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
 -* Include (4.2.6p1) - [Bug 1473] "make distcheck" version.m4 error.
 +* [Bug 1469] u_int32, int32 changes broke HP-UX 10.20 build.
+ * Include (4.2.6p1) - [Bug 1470] "make distdir" compiles keyword-gen.
+ * [Bug 1471] CID 120 CID 121 CID 122 is_ip_address() uninit family.
+ * [Bug 1472] CID 116 CID 117 minor warnings in new DNS code.
++* Include (4.2.6p1) - [Bug 1473] "make distcheck" version.m4 error.
  (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>

diff --cc ntpd/ntp_intres.c
Simple merge