Merge fix for #15465 from 3.3

author Nick Coghlan <ncoghlan@gmail.com>

Thu, 7 Mar 2013 13:45:03 +0000 (23:45 +1000)

committer Nick Coghlan <ncoghlan@gmail.com>

Thu, 7 Mar 2013 13:45:03 +0000 (23:45 +1000)
author Nick Coghlan <ncoghlan@gmail.com>
Thu, 7 Mar 2013 13:45:03 +0000 (23:45 +1000)
committer Nick Coghlan <ncoghlan@gmail.com>
Thu, 7 Mar 2013 13:45:03 +0000 (23:45 +1000)
diff --cc Doc/library/sys.rst
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Nick Coghlan <ncoghlan@gmail.com>
	Thu, 7 Mar 2013 13:45:03 +0000 (23:45 +1000)
committer	Nick Coghlan <ncoghlan@gmail.com>
	Thu, 7 Mar 2013 13:45:03 +0000 (23:45 +1000)
		1	2
Doc/library/sys.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history