Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/bugs/ntp-dev-1595

into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/ntp-gsoc-testing

bk: 4c61e450w8-lfbTkoRhVmf6bQkVJ9g

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