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

into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev-1152

bk: 49fc05bcIDvfTtCfjS1PvhpTJkF4FA

diff --cc ChangeLog
index a67b4934cba455600e7c5c4fbfd252ad68eff1b9,6720cabcdf5144d4b524e2ebf98c9f25709986ac..6ae729d26a23546009ad9fde1e606b335c1d6381
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,10 +1,11 @@@
 +* [Bug 1152] adjust PARSE to new refclock_pps logic
+ * Include (4.2.4p7-RC5)
+ * loopfilter FLL/PLL crossover cleanup from Dave Mills.
+ * Documentation updates from Dave Mills.
+ * ntp-keygen cleanup from Dave Mills.
+ * crypto API cleanup from Dave Mills.
+ * Add NTP_CACHEVERSION mechanism to ignore incompatible config.cache
+ * Enable gcc -Wstrict-overflow for gsoc_sntp as well
  (4.2.5p169) 2009/04/30 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1171] Note that we never look for -lreadline by default.
  * [Bug 1090] Fix bogus leap seconds in refclock_hpgps.

diff --cc configure.ac
Simple merge