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

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

bk: 4a06525fUAIHkGNP52GQMa2-D8S-rg

diff --cc ChangeLog
index 41bd8fad52d36432991e02a29fa754bb89e26636,533eeee8a2979af9b86edb37b046ec47cf88cef2..af358367bd2adf993b750dd7f8694011441ca902
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,7 @@@
+ (4.2.5p174) 2009/05/09 Released by Harlan Stenn <stenn@ntp.org>
  * Stale leapsecond file fixes from Dave Mills.
 +* Clean up configure.ac NTP_CACHEVERSION interface, display cache
 +  version when clearing.  Fixes a regression.
  (4.2.5p173) 2009/05/08 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.4p7-RC6)
  (4.2.5p172) 2009/05/06 Released by Harlan Stenn <stenn@ntp.org>