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

into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-autogen-5.18.4

bk: 53ddcf6aihDHfxRq8cW9CT-Suny_fg

diff --cc ChangeLog
index 2af1ec4ba5b204ba52a00801ccb8189fa8dc9000,310d9d0e82f1d23986f5e9fecc38d5f71db56c88..a003ec96b7f125f48c2be25bf190cd70fb4f865e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,9 @@@
 +* Fix nits in the ntpq man page.
 +* autogen-5.18.4pre9
+ * [Bug 2565] ntpd sometimes logs unexpected getifaddrs() errors.
+ * CID 739722: Clean up the definition of the exten field of struct pkt.
+ (4.2.7p454) 2014/07/30 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2628] 'mon_getmoremem()' relies on undefined behaviour
  (4.2.7p453) 2014/07/19 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2597] leap file loose ends (follow-up)
    - uniform expiration check messages for config and timer triggered

diff --cc scripts/calc_tickadj/calc_tickadj.html
Simple merge

diff --cc scripts/ntpsweep/ntpsweep.html
Simple merge

diff --cc scripts/ntptrace/ntptrace.html
Simple merge

diff --cc scripts/plot_summary.html
Simple merge

diff --cc scripts/summary.html
Simple merge