Merge bk://bk.ntp.org./ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1588

bk: 4c8afddd_DdRzGm74-gXr2h4WucUHA

diff --cc ChangeLog
index 900df0a749e862bf9c8cf58c032582d5ca4c370e,667ab633f2f8f66a93398382dc030f3e21366455..a94209ce75fdb9ce52b11785c64ceeaf7807c636
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,23 +1,24 @@@
 +* [Bug 1588] finish configure --disable-autokey implementation.
+ * 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.
+ (4.2.7p44) 2010/08/27 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1573] from 4.2.6p3-RC1: Miscalculation of offset in sntp.
+ (4.2.7p43) 2010/08/26 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1602] Refactor some of the sntp/ directory to facililtate testing.
+ (4.2.7p42) 2010/08/18 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1593] ntpd abort in free() with logconfig syntax error.
+ * [Bug 1595] from 4.2.6p3-RC1: empty last line in key file causes
+   duplicate key to be added
+ * [Bug 1597] from 4.2.6p3-RC1: packet processing ignores RATE KoD packets,
+   Because of a bug in string comparison.
+ (4.2.7p41) 2010/07/28 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1581] from 4.2.6p3-beta1: ntp_intres.c size_t printf format
+   string mismatch.
+ * [Bug 1586] ntpd 4.2.7p40 doesn't write to syslog after fork on QNX.
+ * Avoid race with parallel builds using same source directory in
+   scripts/genver by using build directory for temporary files.
+ * orphanwait documentation updates.
  (4.2.7p40) 2010/07/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1395] ease ntpdate elimination with ntpd -w/--wait-sync
  * [Bug 1396] allow servers on ntpd command line like ntpdate

diff --cc configure.ac
Simple merge

diff --cc sntp/networking.h
Simple merge