Merge psp-fb1.ntp.org:/.stage/h-thump2/phk/ntp-dev

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

bk: 53ae6eb4trgppjLOypxWQneQPz64dg

diff --cc ChangeLog
index 8815e1159312531ba06967f19eb33311f1760f27,00dedbbdb7689276cde0a63b421a659d04365f46..51432cbf6e8f42031bc0fa7a403c781e7d2a61b9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
- * Fix a variable lifetime issue
 -* [Bug 2597] leap file processing -- loose ends
++* [Bug 2597] leap file processing -- loose ends.
++* Fix a variable lifetime issue.
  (4.2.7p445) 2014/06/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2556] mrulist isn't mentioned in the ntpq man page.
  (4.2.7p444) 2014/05/19 Released by Harlan Stenn <stenn@ntp.org>