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

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

bk: 4c61e3dfgMeCHq8d00bmr03WvkGGqw

diff --cc ChangeLog
index 216f4a51535e5f73711e0e0f1c2fe6ee95e84436,d2732465b486a344832584355061a84fa7bb35b0..0b909a13f208ce32e5c1cd760f6678cd13c5cdb8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,6 @@@
- * [Bug 1597] packet processing ignores RATE KoD packets, because of
-   a bug in string comparison.
+ * [Bug 1597] from 4.2.6p3-RC1: 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.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.