Merge with 3.2

author Ross Lagerwall <rosslagerwall@gmail.com>

Sat, 26 Mar 2011 19:22:09 +0000 (21:22 +0200)

committer Ross Lagerwall <rosslagerwall@gmail.com>

Sat, 26 Mar 2011 19:22:09 +0000 (21:22 +0200)
author Ross Lagerwall <rosslagerwall@gmail.com>
Sat, 26 Mar 2011 19:22:09 +0000 (21:22 +0200)
committer Ross Lagerwall <rosslagerwall@gmail.com>
Sat, 26 Mar 2011 19:22:09 +0000 (21:22 +0200)
diff --cc Lib/test/test_subprocess.py
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Ross Lagerwall <rosslagerwall@gmail.com>
	Sat, 26 Mar 2011 19:22:09 +0000 (21:22 +0200)
committer	Ross Lagerwall <rosslagerwall@gmail.com>
	Sat, 26 Mar 2011 19:22:09 +0000 (21:22 +0200)
		1	2
Lib/test/test_subprocess.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history