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

diff --cc ChangeLog
index 38e0cbc28adc2cd2fd84cb1377ad722932c92372,464cdfb994af0d34b68a65cb0c28bd5e403717b7..dda0c9ba7613dd86c8407790669dc11134a32dfc
--- 1/ChangeLog
--- 2/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