From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 12 Jun 2010 07:54:28 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P35~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b87feae6a9a8c42f60cf96a29a51139d5a843def;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-dev-newlfp

bk: 4c133d343gVg6nXEOH35SljJZvdjvw
---

b87feae6a9a8c42f60cf96a29a51139d5a843def
diff --cc ChangeLog
index 38e0cbc28,464cdfb99..dda0c9ba7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,11 @@@
++<<<<<<< gca ChangeLog 1.589
++<<<<<<< local ChangeLog 1.590
 +* Rewrite of multiprecision macros in 'ntp_fp.h' from J. Perlinger
 +  <perlinger@ntp.org>
++<<<<<<< remote ChangeLog 1.589.1.2
+ * [Bug 715] from 4.2.6p2-RC6: libisc Linux IPv6 interface iteration
+   drops multicast flags.
++>>>>>>>
  (4.2.7p34) 2010/06/05 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1570] serial clock drivers get outdated input from kernel tty
    line buffer after startup