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

into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-dev-2622

bk: 53e5e2feUGjImzCZHITlxitx30v21w

diff --cc ChangeLog
index 78f79dfa7f1102b642940dd8718f5d7f49c37aa8,e576c14d957871bb8e5288ffb8cda2456213d1a8..0f1cf5404e52e72b535ed9d5d57edc4d81f88d2c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,10 @@@
+ * [Bug 2622] Synchronisation problem using SHM when time difference is
+   more than four hours: Change SHM driver so TOY restricted API is not
+   used any more. (Plus some minor cleanup in logic and flow control)
 +* Pass the configration source into the parser as argument rather
 +  than through a global variable.
 +* Fix nits in the ntpq man page.
 +* autogen-5.18.4pre14
  (4.2.7p456) 2014/08/07 Released by Harlan Stenn <stenn@ntp.org>
  * CID 739722: Change the way the extention and MAC fields are processed.
  (4.2.7p455) 2014/08/03 Released by Harlan Stenn <stenn@ntp.org>