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

into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-2473

bk: 523a9171hYeHPm9QCyphTGxkoqfAeg

diff --cc ChangeLog
index 59d42f619c4c5c1f19efa67d4b69fb3ffe761716,4b7399f18fa2e105a8cc638b8c5eff6a9172d951..f6df78c382d6cdc7395f108f0ffdd8f5e93ef7bd
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,4 +1,8 @@@
+ * [Bug 2473] NTPD exits after clock is stepped backwards externally
 +(4.2.7p387) 2013/09/16 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1642] ntpdsim can't find simnulate block in config file.
 +(4.2.7p386) 2013/09/01 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2472] (WinXP) Avoid self-termination of IO thread during exit().
  (4.2.7p385) 2013/08/19 Released by Harlan Stenn <stenn@ntp.org>
  * CID 975596: Copy/paste error: vallen should be siglen.
  * CID 1009579: Check return status of X509_add_ext().