Merge from 3.2

author Antoine Pitrou <solipsis@pitrou.net>

Sat, 16 Apr 2011 16:55:16 +0000 (18:55 +0200)

committer Antoine Pitrou <solipsis@pitrou.net>

Sat, 16 Apr 2011 16:55:16 +0000 (18:55 +0200)
author Antoine Pitrou <solipsis@pitrou.net>
Sat, 16 Apr 2011 16:55:16 +0000 (18:55 +0200)
committer Antoine Pitrou <solipsis@pitrou.net>
Sat, 16 Apr 2011 16:55:16 +0000 (18:55 +0200)
diff --cc Lib/test/regrtest.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Antoine Pitrou <solipsis@pitrou.net>
	Sat, 16 Apr 2011 16:55:16 +0000 (18:55 +0200)
committer	Antoine Pitrou <solipsis@pitrou.net>
	Sat, 16 Apr 2011 16:55:16 +0000 (18:55 +0200)
		1	2
Lib/test/regrtest.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history