From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 31 Aug 2008 09:00:34 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P128~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97adab7ca8fd791f1c155b4e49369678755b6a1c;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/gerstung/gsoc/ntp-dev

bk: 48ba5db2_DwJvPufPbMtmu1H_dbuuA
---

97adab7ca8fd791f1c155b4e49369678755b6a1c
diff --cc ChangeLog
index 900e704d7,8e12fbaef..8095241f9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * Prepare for GSoC2008 NTP MIB daemon import.
 +* 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.
  * Changes from Dave Mills: