Merge fix for #11490 from 3.2.

author R David Murray <rdmurray@bitdance.com>

Mon, 14 Mar 2011 02:31:35 +0000 (22:31 -0400)

committer R David Murray <rdmurray@bitdance.com>

Mon, 14 Mar 2011 02:31:35 +0000 (22:31 -0400)
author R David Murray <rdmurray@bitdance.com>
Mon, 14 Mar 2011 02:31:35 +0000 (22:31 -0400)
committer R David Murray <rdmurray@bitdance.com>
Mon, 14 Mar 2011 02:31:35 +0000 (22:31 -0400)
diff --cc Lib/test/test_subprocess.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Mon, 14 Mar 2011 02:31:35 +0000 (22:31 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Mon, 14 Mar 2011 02:31:35 +0000 (22:31 -0400)
		1	2
Lib/test/test_subprocess.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history