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

bk: 4c6b6cebOh_MlXMQ33v1Mhk10JcEzg

diff --cc ChangeLog
index b747f715f7575e3cd1913b93863611861340cc81,3e2f88ded45c592e5f4caca7ec5bc09873f35e80..0cca80e8e18748ecf3e28be878d17776d3f93d48
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,8 @@@
  ---
  
 +* [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>