Merge

author Antoine Pitrou <solipsis@pitrou.net>

Tue, 15 Mar 2011 20:10:33 +0000 (21:10 +0100)

committer Antoine Pitrou <solipsis@pitrou.net>

Tue, 15 Mar 2011 20:10:33 +0000 (21:10 +0100)
author Antoine Pitrou <solipsis@pitrou.net>
Tue, 15 Mar 2011 20:10:33 +0000 (21:10 +0100)
committer Antoine Pitrou <solipsis@pitrou.net>
Tue, 15 Mar 2011 20:10:33 +0000 (21:10 +0100)
diff --cc Lib/test/support.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Antoine Pitrou <solipsis@pitrou.net>
	Tue, 15 Mar 2011 20:10:33 +0000 (21:10 +0100)
committer	Antoine Pitrou <solipsis@pitrou.net>
	Tue, 15 Mar 2011 20:10:33 +0000 (21:10 +0100)
		1	2
Lib/test/support.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history