Automated merge.

diff --cc tests/ChangeLog
index 6e2b41a4994e2dfc3ff80f904f8ef340c9e84fdd,683f099f322234ef42c10c53cd783331d2b5607a..5b0d571d6deaf62a599ef1cf2a48d67f5b3632a5
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,8 -1,18 +1,23 @@@
 +2009-09-01  Micah Cowan  <micah@cowan.name>
 +
 +      * Makefile.am (../src/libunittest.a): Make it a phony target,
 +      so we always make sure to get up-to-date unit-test runs.
 +
+ 2009-09-01  Steven Schubiger  <stsc@member.fsf.org>
+ 
+       * Makefile.am: Add Test-cookies.px, Test-cookies-401.px
+       and Test-restrict-ascii.px to EXTRA_DIST.
+ 
+ 2009-08-31  Steven Schubiger  <stsc@member.fsf.org>
+ 
+       * Makefile.am: Add Test-k.px to EXTRA_DIST.
+ 
+ 2009-08-29  Steven Schubiger  <stsc@member.fsf.org>
+ 
+       * run-px: Add Test-k.px to the list.
+ 
+       * Test-k.px: Test escaping of semicolons in local file strings.
+ 
  2009-08-27  Micah Cowan  <micah@cowan.name>
  
        * WgetTest.pm.in (run): Shift the errcode right by 8 binary places.

diff --cc tests/Makefile.am
Simple merge