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

into  pogo.udel.edu:/pogo/users/murray/shm

bk: 49177aabapsuUavj7d47KWTkBrdhIw

diff --cc ChangeLog
index 39f6643e04b1f8b81a176e58a12f2b0aba5648af,c1969f010a9ce0ea0a04ad9b6b9e2ab7179a1d65..1e4938165a15b839c3f140399751ca28a0dd9c83
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,8 +1,9 @@@
 +* SHM driver grabs more samples, add clockstats
+ (4.2.5p137) 2008/11/01 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1069] #undef netsnmp's PACKAGE_* macros.
+ * [Bug 1068] Older versions of netsnmp do not have netsnmp_daemonize().
+ (4.2.5p136) 2008/10/27 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1078] statsdir configuration parsing is broken.
  (4.2.5p135) 2008/09/23 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1072] clock_update should not allow updates older than sys_epoch.
  (4.2.5p134) 2008/09/17 Released by Harlan Stenn <stenn@ntp.org>