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

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

bk: 49fc8ff7-niJPy2lQFrq_5bHOHqCTQ

diff --cc ChangeLog
index f008ac99b010a7ac58fbe9955cf1af28a6353894,cdbf23096ee260ec72f9b5ea93cab8567e242d23..1d6839d31258dc055fc9c8cd52e7fbf243562d87
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
+ * do not clear config.cache when it is already empty
 +(4.2.5p170) 2009/05/02 Released by Harlan Stenn <stenn@ntp.org>
 +* [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.