Merge from 3.1
authorKurt B. Kaiser <kbk@shore.net>
Sat, 26 Mar 2011 00:32:00 +0000 (20:32 -0400)
committerKurt B. Kaiser <kbk@shore.net>
Sat, 26 Mar 2011 00:32:00 +0000 (20:32 -0400)
1  2 
Lib/idlelib/EditorWindow.py
Lib/idlelib/NEWS.txt

Simple merge
Simple merge