From: Linux Karlsson <karlsson@ntp.org>
Date: Tue, 10 Aug 2010 23:42:23 +0000 (+0200)
Subject: Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/bugs/ntp-dev-1597
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72c3dd14547a4e556ee1cf38aadd6a930e7bc188;p=thirdparty%2Fntp.git

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
---

72c3dd14547a4e556ee1cf38aadd6a930e7bc188
diff --cc ChangeLog
index 216f4a5153,d2732465b4..0b909a13f2
--- a/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.