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

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

bk: 4917b0b3qiu4Us_j6WUM4HwJ_3yUZw

diff --cc ChangeLog
index 1e4938165a15b839c3f140399751ca28a0dd9c83,e15bf04a3077c9e5397e68c33f6beb675bada828..f5aa5057645ec59cf61ab244e06dec94d6ca4695
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* SHM driver grabs more samples, add clockstats
+ * decode.html and driver20.html updates from Dave Mills.
  (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().