#5057: Merge with 3.2.

author Ezio Melotti <ezio.melotti@gmail.com>

Fri, 15 Apr 2011 13:52:35 +0000 (16:52 +0300)

committer Ezio Melotti <ezio.melotti@gmail.com>

Fri, 15 Apr 2011 13:52:35 +0000 (16:52 +0300)
author Ezio Melotti <ezio.melotti@gmail.com>
Fri, 15 Apr 2011 13:52:35 +0000 (16:52 +0300)
committer Ezio Melotti <ezio.melotti@gmail.com>
Fri, 15 Apr 2011 13:52:35 +0000 (16:52 +0300)
diff --cc Lib/test/test_peepholer.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Python/peephole.c
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 15 Apr 2011 13:52:35 +0000 (16:52 +0300)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 15 Apr 2011 13:52:35 +0000 (16:52 +0300)
		1	2
Lib/test/test_peepholer.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/peephole.c	patch \|	diff1 \|	diff2 \|	blob \| history