Merge follow-up for #11254 and other changes from 3.2

author Éric Araujo <merwok@netwok.org>

Thu, 3 Nov 2011 04:17:11 +0000 (05:17 +0100)

committer Éric Araujo <merwok@netwok.org>

Thu, 3 Nov 2011 04:17:11 +0000 (05:17 +0100)
author Éric Araujo <merwok@netwok.org>
Thu, 3 Nov 2011 04:17:11 +0000 (05:17 +0100)
committer Éric Araujo <merwok@netwok.org>
Thu, 3 Nov 2011 04:17:11 +0000 (05:17 +0100)
diff --cc Doc/using/cmdline.rst
Simple merge
diff --cc Lib/_pyio.py
Simple merge
diff --cc Python/import.c
Simple merge
author	Éric Araujo <merwok@netwok.org>
	Thu, 3 Nov 2011 04:17:11 +0000 (05:17 +0100)
committer	Éric Araujo <merwok@netwok.org>
	Thu, 3 Nov 2011 04:17:11 +0000 (05:17 +0100)
		1	2
Doc/using/cmdline.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/_pyio.py	patch \|	diff1 \|	diff2 \|	blob \| history
Python/import.c	patch \|	diff1 \|	diff2 \|	blob \| history