merge from 3.2

author Senthil Kumaran <senthil@uthcode.com>

Sat, 14 Jan 2012 10:39:06 +0000 (18:39 +0800)

committer Senthil Kumaran <senthil@uthcode.com>

Sat, 14 Jan 2012 10:39:06 +0000 (18:39 +0800)
author Senthil Kumaran <senthil@uthcode.com>
Sat, 14 Jan 2012 10:39:06 +0000 (18:39 +0800)
committer Senthil Kumaran <senthil@uthcode.com>
Sat, 14 Jan 2012 10:39:06 +0000 (18:39 +0800)
diff --cc Lib/test/regrtest.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Senthil Kumaran <senthil@uthcode.com>
	Sat, 14 Jan 2012 10:39:06 +0000 (18:39 +0800)
committer	Senthil Kumaran <senthil@uthcode.com>
	Sat, 14 Jan 2012 10:39:06 +0000 (18:39 +0800)
		1	2
Lib/test/regrtest.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history