Merge cleanup

bk: 4a094371IcF9oAbxxV7WfrjiF4KLNg

diff --git a/ChangeLog b/ChangeLog
index 62c12d77e34ef201141a05bb2135878d1a6cded4..ba20c569e7f15f4a79d79598d897f72f33c41f96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Include (4.2.4p7-RC7)
 * [Bug 1180] ntpd won't start with more than ~1000 interfaces
 * [Bug 1182] Documentation typos and missing bits.
 * [Bug 1183] COM port support should extend past COM3