From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 2 Feb 2010 09:16:51 +0000 (-0500)
Subject: Merge bk://maccarony/ntp-dev
X-Git-Tag: NTP_4_2_7P14~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01d22da1e1af8132f9021e03b3d11acd3fa55dfc;p=thirdparty%2Fntp.git

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

bk: 4b67ed83TR0VEok1LaUGfWStMkmSIg
---

01d22da1e1af8132f9021e03b3d11acd3fa55dfc
diff --cc ChangeLog
index f2ba81085,0712f9036..c3d13b8d5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
 +* [Bug 1469] u_int32, int32 changes broke HP-UX 10.20 build.
+ * Include (4.2.6p1) - [Bug 1470] "make distdir" compiles keyword-gen.
 -* Include (4.2.6p1) - [Bug 1473] "make distcheck" version.m4 error.
+ * [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>