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

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

bk: 4c6b7e53nJrChI89rErvcQ9HW6XhFw

diff --cc ChangeLog
index 49ac8f7d196e87b1034cfb79e48547e329bfbc1f,3ec867c51a33f6d047a97db1cafa8bce2aae4934..e6794307ef5b14977d68fec8dc88eb4866c9fa7c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
 +* [Bug 1593] ntpd abort in free() with logconfig syntax error.
+ * [Bug 1595] from 4.2.6p3-RC1: empty last line in key file causes
+   duplicate key to be added
+ * [Bug 1597] from 4.2.6p3-RC1: packet processing ignores RATE KoD packets,
+   Because of a bug in string comparison.
  (4.2.7p41) 2010/07/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1581] from 4.2.6p3-beta1: ntp_intres.c size_t printf format
    string mismatch.