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

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

bk: 5043cc0aDCs3w5sI3Nqblv95C_ZZ8Q

diff --cc ChangeLog
index 1b836a5e007b723187b7314cdbda7e47f016b31b,494954dd2ab4be001611c6e0af3d2aba86f6f284..89dda6b639db3c1f1dc12933d8da32422367c98b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,7 +1,14 @@@
+ * [Bug 2262] Install sntp.html into htmldir.
+ * [Bug 2270] Install fails due to repeated man5 page names.
 +(4.2.7p299) 2012/09/01 Released by Harlan Stenn <stenn@ntp.org>
 +* More cleanup to the bootstrap script.
 +(4.2.7p298) 2012/09/01 Released by Harlan Stenn <stenn@ntp.org>
 +* Handle additional man page sections in the bootstrap script.
 +* Remove extraneous parens.
 +* Add a missing "%s" syslog format string.
 +(4.2.7p297) 2012/09/01 Released by Harlan Stenn <stenn@ntp.org>
  * Fix mdoc2man.
 -* Distribute ntp.conf.def.
 +* Distribute ntp.conf.def and ntp.keys.def.
  (4.2.7p296) 2012/08/31 Released by Harlan Stenn <stenn@ntp.org>
  * Begin support for autogen maintaining ntp.conf and ntp.keys docs.
  * Upgrade to autogen-5.16.2 and libopts-36.5.11.

diff --cc ntpd/Makefile.am
Simple merge