From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 11 Sep 2010 04:46:02 +0000 (-0400)
Subject: Merge pogo:/usa/hart/ntp-dev-1588
X-Git-Tag: NTP_4_2_7P47~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd287a153944e2bf8c5f0590231b72e63281213b;p=thirdparty%2Fntp.git

Merge pogo:/usa/hart/ntp-dev-1588
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4c8b098aF_lv8Co6lqJVhUh6mVdauQ
---

bd287a153944e2bf8c5f0590231b72e63281213b
diff --cc ChangeLog
index a94209ce7,25bf3b24c..d821bc016
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 1588] finish configure --disable-autokey implementation.
+ (4.2.7p46) 2010/09/10 Released by Harlan Stenn <stenn@ntp.org>
  * Use AC_SEARCH_LIBS instead of AC_CHECK_LIB for NTP_LIB_M.
  (4.2.7p45) 2010/09/05 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1578] Consistently use -lm when needed.