Merge fixes for #1326113 and #12297 from 3.2

author Éric Araujo <merwok@netwok.org>

Wed, 15 Feb 2012 16:13:26 +0000 (17:13 +0100)

committer Éric Araujo <merwok@netwok.org>

Wed, 15 Feb 2012 16:13:26 +0000 (17:13 +0100)
author Éric Araujo <merwok@netwok.org>
Wed, 15 Feb 2012 16:13:26 +0000 (17:13 +0100)
committer Éric Araujo <merwok@netwok.org>
Wed, 15 Feb 2012 16:13:26 +0000 (17:13 +0100)
diff --cc Doc/library/atexit.rst
Simple merge
diff --cc Lib/distutils/command/build_ext.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Éric Araujo <merwok@netwok.org>
	Wed, 15 Feb 2012 16:13:26 +0000 (17:13 +0100)
committer	Éric Araujo <merwok@netwok.org>
	Wed, 15 Feb 2012 16:13:26 +0000 (17:13 +0100)
		1	2
Doc/library/atexit.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/distutils/command/build_ext.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history