merge.

diff --cc Misc/NEWS
index c75e578c69125c4e25d7c74a195ee8e5e01f6d96,620fae881f05a6c8db948a44760d577f28fa0a12..c5842995d8ac33498094da75ce47993974c155ff
--- 1/Misc/NEWS
--- 2/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
  -----------