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

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

bk: 4a04a9e7x4MXRooxbsPRNuQhCJkX5Q

diff --cc ChangeLog
index 9550d097952a9682dfd7c851023a9e5df777180d,1122aa40639eccb103137baebb9d4ef079204c3d..5af7767eebe1dec7a0f723903a9d8e5be4b301bd
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
+ * 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>

diff --cc ntpd/ntp_timer.c
Simple merge