Branch merge

author Éric Araujo <merwok@netwok.org>

Tue, 15 Nov 2011 15:12:22 +0000 (16:12 +0100)

committer Éric Araujo <merwok@netwok.org>

Tue, 15 Nov 2011 15:12:22 +0000 (16:12 +0100)
author Éric Araujo <merwok@netwok.org>
Tue, 15 Nov 2011 15:12:22 +0000 (16:12 +0100)
committer Éric Araujo <merwok@netwok.org>
Tue, 15 Nov 2011 15:12:22 +0000 (16:12 +0100)
diff --cc Lib/test/regrtest.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Éric Araujo <merwok@netwok.org>
	Tue, 15 Nov 2011 15:12:22 +0000 (16:12 +0100)
committer	Éric Araujo <merwok@netwok.org>
	Tue, 15 Nov 2011 15:12:22 +0000 (16:12 +0100)
		1	2
Lib/test/regrtest.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history