Merge from 3.1

diff --cc Lib/idlelib/NEWS.txt
index f84dd41dfe85296f7924c18e7569a2173599b929,d4bb00996ac0f7b8577a441b821ae2850bc52fd6..18a2b82d72557f911f48c51c3c02b871bd5c619d
--- 1/Lib/idlelib/NEWS.txt
--- 2/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,8 -1,10 +1,10 @@@
 -What's New in IDLE 3.1.4?
 +What's New in IDLE 3.2.1?
  =========================
  
 -*Release date: XX-XXX-11*
 +*Release date: 15-May-11*
  
+ - Issue #11896: Save on Close failed despite selecting "Yes" in dialog.
+ 
  - Issue #1028: Ctrl-space binding to show completions was causing IDLE to exit.
    Tk < 8.5 was sending invalid Unicode null; replaced with valid null.