Merge pogo:/usa/hart/ntp-dev-1588

into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4c8b098aF_lv8Co6lqJVhUh6mVdauQ

diff --cc ChangeLog
index a94209ce75fdb9ce52b11785c64ceeaf7807c636,25bf3b24c10818beaff8cd8d5cf976ea207ee3f3..d821bc016a1b67abf07083a1783053d00c4fd203
--- 1/ChangeLog
--- 2/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.

diff --cc util/ntp-keygen-opts.c
Simple merge

diff --cc util/ntp-keygen-opts.h
Simple merge