Merge psp-fb2.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/karlsson/bugs/ntp...

into  psp-fb2.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/karlsson/bugs/ntp-dev-1595-7

bk: 4c6b6e788HuXYcvDjAhNzD9RnJHWhg

diff --cc ChangeLog
index 8d19215aaeed8ff9cec70c21a1d536be1bd3a759,d2732465b486a344832584355061a84fa7bb35b0..3ec867c51a33f6d047a97db1cafa8bce2aae4934
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
 +* [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.
@@@ -311,7 -311,8 +313,9 @@@
  * [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
  ---
  
 +* [Bug 1595] empty last line in key file causes duplicate key to be added
+ * [Bug 1597] packet processing ignores RATE KoD packets, because of
+   a bug in string comparison.
  
  ---
  (4.2.6p2) 2010/07/09 Released by Harlan Stenn <stenn@ntp.org>