From: Kurt B. Kaiser <kbk@shore.net>
Date: Thu, 12 May 2011 19:30:18 +0000 (-0400)
Subject: Merge from 3.1
X-Git-Tag: v3.2.1rc1~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b00d0c49448c48b6ddbd85f1328edf8794ae20f7;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.1
---

b00d0c49448c48b6ddbd85f1328edf8794ae20f7
diff --cc Lib/idlelib/NEWS.txt
index f84dd41dfe85,d4bb00996ac0..18a2b82d7255
--- a/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.