Issue #10997: merge from 3.2

author Ned Deily <nad@acm.org>

Tue, 29 May 2012 17:51:38 +0000 (10:51 -0700)

committer Ned Deily <nad@acm.org>

Tue, 29 May 2012 17:51:38 +0000 (10:51 -0700)
author Ned Deily <nad@acm.org>
Tue, 29 May 2012 17:51:38 +0000 (10:51 -0700)
committer Ned Deily <nad@acm.org>
Tue, 29 May 2012 17:51:38 +0000 (10:51 -0700)
diff --cc Lib/idlelib/EditorWindow.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Ned Deily <nad@acm.org>
	Tue, 29 May 2012 17:51:38 +0000 (10:51 -0700)
committer	Ned Deily <nad@acm.org>
	Tue, 29 May 2012 17:51:38 +0000 (10:51 -0700)
		1	2
Lib/idlelib/EditorWindow.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history