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

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

bk: 53e5d95fqPtcXZvB58Lnermi3WFDMw

diff --cc ChangeLog
index 21766658643c6e00f7da02d0cb1f4f7b74828ca1,09a5b048f5d0891c9fb494c660c9f1568e940a3c..78f79dfa7f1102b642940dd8718f5d7f49c37aa8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
+ * 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>