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

into  psp-deb1.ntp.org:/home/karlsson/bugs/ntp-dev-2413

bk: 51ecf4de2-ELcBFvi1weSNcyziJQLA

diff --cc ChangeLog
index d3092977ff75d83cd79bc117f94c9b3975e98a56,e3b35cda6fdb31d4075483ffe9cdcc39d32bd528..e79a4d10eefc12922f339509f1349f2c88f193dc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,7 @@@
+ * [Bug 2368] Correct bug in previous attempt.
 +* [Bug 2413] Fix "make check" with automake >= 1.13.
  (4.2.7p374) 2013/07/21 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2368] make check troubles in libevent.
 -* [Bug 2413] Fix "make check" with automake >= 1.13.
  * [Bug 2425] setup SIGIO/SIGPOLL for asyncio on the read side
    of a socketpair for the worker thread.
  (4.2.7p373) 2013/07/20 Released by Harlan Stenn <stenn@ntp.org>