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

into  pogo.udel.edu:/pogo/users/gerstung/gsoc/ntp-dev

bk: 48c4da52d7nne4KndX1cgXaYmV4pPA

diff --cc ChangeLog
index 8095241f98310ede8f6f42baa1bf432906d33f9b,a1826ac80639990fe57d497868d3cd4bbf659331..8b49c8f9586a95af958824e955e31545260b25d1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
- * Prepare for GSoC2008 NTP MIB daemon import.
++* Import Heiko Gerstung's GSoC2008 NTP MIB daemon.
+ (4.2.5p127) 2008/09/01 Released by Harlan Stenn <stenn@ntp.org>
+ (4.2.5p126) 2008/08/31 Released by Harlan Stenn <stenn@ntp.org>
  * Stop libtool-1.5 from looking for C++ or Fortran.
  * [BUG 610] Documentation update for NMEA reference clock driver.
  * [Bug 828] Fix IPv4/IPv6 address parsing.