merge 3.2

author Benjamin Peterson <benjamin@python.org>

Tue, 12 Apr 2011 23:35:21 +0000 (18:35 -0500)

committer Benjamin Peterson <benjamin@python.org>

Tue, 12 Apr 2011 23:35:21 +0000 (18:35 -0500)
author Benjamin Peterson <benjamin@python.org>
Tue, 12 Apr 2011 23:35:21 +0000 (18:35 -0500)
committer Benjamin Peterson <benjamin@python.org>
Tue, 12 Apr 2011 23:35:21 +0000 (18:35 -0500)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/ast.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Tue, 12 Apr 2011 23:35:21 +0000 (18:35 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Tue, 12 Apr 2011 23:35:21 +0000 (18:35 -0500)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/ast.c	patch \|	diff1 \|	diff2 \|	blob \| history