Merge 3.2.

author Thomas Wouters <thomas@python.org>

Sun, 6 Mar 2011 19:52:15 +0000 (11:52 -0800)

committer Thomas Wouters <thomas@python.org>

Sun, 6 Mar 2011 19:52:15 +0000 (11:52 -0800)
author Thomas Wouters <thomas@python.org>
Sun, 6 Mar 2011 19:52:15 +0000 (11:52 -0800)
committer Thomas Wouters <thomas@python.org>
Sun, 6 Mar 2011 19:52:15 +0000 (11:52 -0800)
diff --cc Makefile.pre.in
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Thomas Wouters <thomas@python.org>
	Sun, 6 Mar 2011 19:52:15 +0000 (11:52 -0800)
committer	Thomas Wouters <thomas@python.org>
	Sun, 6 Mar 2011 19:52:15 +0000 (11:52 -0800)
		1	2
Makefile.pre.in	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history