From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 13 Apr 2011 01:43:05 +0000 (+0800)
Subject: merge.
X-Git-Tag: v3.3.0a1~2602
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9526c621851b69214aaa41cf291573e7116a0f11;p=python

merge.
---

9526c621851b69214aaa41cf291573e7116a0f11
diff --cc Misc/NEWS
index c75e578c69,620fae881f..c5842995d8
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -425,8 -226,12 +425,15 @@@ Buil
  
  - Issue #11268: Prevent Mac OS X Installer failure if Documentation
    package had previously been installed.
- 
++  
 +- Issue #11495: OSF support is eliminated. It was deprecated in Python 3.2.
++  
+ 
+ IDLE
+ ----
+ 
+ - Issue #11718: IDLE's open module dialog couldn't find the __init__.py
+   file in a package.
  
  Tools/Demos
  -----------