merge cleanup

bk: 4c4fa094kAKV418GDIibK1aioeWAYA

diff --git a/ChangeLog b/ChangeLog
index 9cf9b64d0b04c157a519f4f4435d29b859dbad08..46a78503acd2d9b3c9845d58aaad01df32a1fc11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 1581] from 4.2.6p3-beta1: ntp_intres.c size_t printf format
+  string mismatch.
 * [Bug 1586] ntpd 4.2.7p40 doesn't write to syslog after fork on QNX.
 * Avoid race with parallel builds using same source directory in
   scripts/genver by using build directory for temporary files.