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

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

bk: 4a0415bacMTYjjtpgNdHZP3W0BA6Rw

diff --cc ChangeLog
index d37c6cae2d65e1ef3e4be9becdf287d2b50f3790,ab7543312022ed3711f38fa3bab14ce9c8a24df7..cfacba1b0702807ec8b533a55d8acd99dfbac0fa
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
 +* Clean up configure.ac NTP_CACHEVERSION interface, display cache
 +  version when clearing.  Fixes a regression.
+ * Include (4.2.4p7-RC6)
  (4.2.5p172) 2009/05/06 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1175] Instability in PLL daemon mode.
  * [Bug 1176] refclock_parse.c does not compile without PPSAPI.

diff --cc configure.ac
Simple merge