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

into  psp-deb1.ntp.org:/home/stenn/ntp-dev-autogen-5.17

bk: 50debaf7k5Uk7lsvcuIOcu8Fe0dAQw

diff --cc ChangeLog
index 51b83eacbe336149a3e402868928aa3c6ebc51b5,601f92274af79606f4d0fe6b21214afdc83282a8..d0bfff94010917abfb4d7143cf38c5b07f90be57
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* Upgrade to autogen-5.17 and libopts-37.0.12.
+ (4.2.7p340) 2012/12/29 Released by Harlan Stenn <stenn@ntp.org>
  * mdoc2texi fixes: trailing punctuation.
  (4.2.7p339) 2012/12/26 Released by Harlan Stenn <stenn@ntp.org>
  * mdoc2texi fixes: parseQuote, closing of list item tables.