Merge #10206: add test for previously fixed bug.

author R David Murray <rdmurray@bitdance.com>

Fri, 24 Jun 2011 17:28:08 +0000 (13:28 -0400)

committer R David Murray <rdmurray@bitdance.com>

Fri, 24 Jun 2011 17:28:08 +0000 (13:28 -0400)
author R David Murray <rdmurray@bitdance.com>
Fri, 24 Jun 2011 17:28:08 +0000 (13:28 -0400)
committer R David Murray <rdmurray@bitdance.com>
Fri, 24 Jun 2011 17:28:08 +0000 (13:28 -0400)
diff --cc Lib/test/test_cmd_line.py
Simple merge
diff --cc Misc/ACKS

index 50a8e341bf8158c7b2138326864b87be085a8300,06853b9535c24454db3ed35dade23cb6d2ee52b1..04d986a88fc140e7b16d2cdf66b493c5e7a24d2a
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -126,9 -120,9 +126,10 @@@ Michael Broghto
   Daniel Brotsky
   Jean Brouwers
   Gary S. Brown
+ +Titus Brown
   Oleg Broytmann
   Dave Brueck
+ Francisco Martín Brugué
   Stan Bubrouski
   Erik de Bueger
   Dick Bulterman
author	R David Murray <rdmurray@bitdance.com>
	Fri, 24 Jun 2011 17:28:08 +0000 (13:28 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Fri, 24 Jun 2011 17:28:08 +0000 (13:28 -0400)
		1	2
Lib/test/test_cmd_line.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history