Merge bk://bk2.ntp.org./ntp-stable

into  psp-fb2.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/hart/ntp-stable-1584

bk: 4cb6b01cqe8GNwEUbl5qgHk3xtHwGg

diff --cc ChangeLog
index 74c9bb65c3ad5586a6b11eaa2b5860ebf1f69dd7,6ae7151b5a691ee186c3d87e824e545ac886b218..70a42596c6612ea6b4c5dd05952fe135f1ba726c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,8 +1,15 @@@
  ---
  
 -* [Bug 1643]: Range-check the decoding of the RIPE-NCC status codes.
 -* [Bug 1644]: cvo.sh should use lsb_release to identify linux distros.
 +* [Bug 750] Non-existing device causes coredump with RIPE-NCC driver.
 +* [Bug 1080] ntpd on ipv6 routers very chatty.
 +* [Bug 1567] Support Arbiter 1093C Satellite Clock on Windows.
 +* [Bug 1581] printf format string mismatch leftover.
+ * [Bug 1584]: ntpsnmpd OID must be mib-2.197.
 +* [Bug 1643] Range-check the decoding of the RIPE-NCC status codes.
 +* [Bug 1644] cvo.sh should use lsb_release to identify linux distros.
 +* [Bug 1659] Support Truetime Satellite Clocks on Windows.
 +* [Bug 1660] On some systems, test is in /usr/bin, not /bin.
 +* [Bug 1661] Re-indent refclock_ripencc.c.
  
  ---
  (4.2.6p3-RC2) 2010/09/25 Released by Harlan Stenn <stenn@ntp.org>