Merge 3.2

author Brian Curtin <brian@python.org>

Thu, 27 Dec 2012 20:06:06 +0000 (14:06 -0600)

committer Brian Curtin <brian@python.org>

Thu, 27 Dec 2012 20:06:06 +0000 (14:06 -0600)
author Brian Curtin <brian@python.org>
Thu, 27 Dec 2012 20:06:06 +0000 (14:06 -0600)
committer Brian Curtin <brian@python.org>
Thu, 27 Dec 2012 20:06:06 +0000 (14:06 -0600)
diff --cc Misc/NEWS
Simple merge
diff --cc PC/winreg.c
Simple merge
author	Brian Curtin <brian@python.org>
	Thu, 27 Dec 2012 20:06:06 +0000 (14:06 -0600)
committer	Brian Curtin <brian@python.org>
	Thu, 27 Dec 2012 20:06:06 +0000 (14:06 -0600)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
PC/winreg.c	patch \|	diff1 \|	diff2 \|	blob \| history