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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1314

bk: 4ab6c668NN9Qd3-JGyDtpeEL-TmT-g

diff --cc ChangeLog
index f2513dc97c13fe761356d4cbfef6cd0852c41510,5b7603fb31244b7bbe7059018f5774da93b433fb..9536cbc4873a7fc9051050c13634c9ffa93d5381
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
+ * [Bug 1314] saveconfig emits -4 and -6 on when not given.
+ * clarify (former) NO_ARG, SINGLE_ARG, MULTIPLE_ARG renaming to
+   FOLLBY_TOKEN, FOLLBY_STRING, FOLLBY_STRINGS_TO_EOC.
+ * parser, saveconfig cleanup to store T_ identifiers in syntax tree.
 +(4.2.5p217) 2009/09/20 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1300] reject remote configuration of dangerous items.
  (4.2.5p216) 2009/09/19 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1312] ntpq/ntpdc MD5 passwords truncated to 8 chars on Suns.