From: Dave Hart <hart@ntp.org>
Date: Sun, 13 Dec 2009 04:14:20 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1414
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e3a42152e44540effe091c5a99fcaa3190612de;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1414
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1414

bk: 4b246a1cx5rcHt6CB4QS7ym8TP_jlw
---

7e3a42152e44540effe091c5a99fcaa3190612de
diff --cc ChangeLog
index 6610385f01,c5f2456410..fa191aed06
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,10 @@@
 +(4.2.7) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
 +
+ ---
+ 
+ * [Bug 1414] Enable "make distcheck" success with BSD make.
+ 
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.4p8) - [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.