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

into  pogo.udel.edu:/pogo/users/burnicki/ntp-dev-bug-1112

bk: 496725fcW_ZEINVE1VN_VHsKYcSfAg

diff --cc ChangeLog
index 82c7a4f9b29c08e4e899aea57519067c2918867b,41a7ad5464162c0c8c7cd905b134ec5e9eb1f0bf..439d3a0e0a88310056a462565bbf315e8741c3ff
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,8 @@@
 +* Renamed gsoc_sntp/:fetch-stubs to gsoc_sntp/fetch-stubs to avoid
 +  file name problems under Windows.
 +  Removed German umlaut from log msg for 4.2.5p142.
+ (4.2.5p152) 2009/01/08 Released by Harlan Stenn <stenn@ntp.org>
+ * Include (4.2.4p6) 2009/01/08 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.5p151) 2008/12/23 Released by Harlan Stenn <stenn@ntp.org>
  * Stats file logging cleanup from Dave Mills.
  (4.2.5p150) 2008/12/15 Released by Harlan Stenn <stenn@ntp.org>