Merge 3.2.3 release clone.

author Georg Brandl <georg@python.org>

Wed, 11 Apr 2012 10:46:24 +0000 (12:46 +0200)

committer Georg Brandl <georg@python.org>

Wed, 11 Apr 2012 10:46:24 +0000 (12:46 +0200)
author Georg Brandl <georg@python.org>
Wed, 11 Apr 2012 10:46:24 +0000 (12:46 +0200)
committer Georg Brandl <georg@python.org>
Wed, 11 Apr 2012 10:46:24 +0000 (12:46 +0200)
diff --cc .hgtags
Simple merge
diff --cc Include/patchlevel.h
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Georg Brandl <georg@python.org>
	Wed, 11 Apr 2012 10:46:24 +0000 (12:46 +0200)
committer	Georg Brandl <georg@python.org>
	Wed, 11 Apr 2012 10:46:24 +0000 (12:46 +0200)
		1	2
.hgtags	patch \|	diff1 \|	diff2 \|	blob \| history
Include/patchlevel.h	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history