merge 2.7.7 release branch

diff --cc Misc/NEWS
index 1508fa7849b9831a8c1d7b19c7f116632cf001a6,ba0a4efd192ed44a45e2d650c734cbe76885a346..012acd7e4fa82eb13f186bfbaf460743016c3561
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,57 -2,19 +2,70 @@@
  Python News
  +++++++++++
  
 +What's New in Python 2.7.8?
 +===========================
 +
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #21523: Fix over-pessimistic computation of the stack effect of
 +  some opcodes in the compiler.  This also fixes a quadratic compilation
 +  time issue noticeable when compiling code with a large number of "and"
 +  and "or" operators.
 +
 +Library
 +-------
 +
 +- Issue #21552: Fixed possible integer overflow of too long string lengths in
 +  the tkinter module on 64-bit platforms.
 +
 +- Issue #14315: The zipfile module now ignores extra fields in the central
 +  directory that are too short to be parsed instead of letting a struct.unpack
 +  error bubble up as this "bad data" appears in many real world zip files in
 +  the wild and is ignored by other zip tools.
 +
 +- Issue #21402: Tkinter.ttk now works when default root window is not set.
 +
 +- Issue #10203: sqlite3.Row now truly supports sequence protocol.  In particulr
 +  it supports reverse() and negative indices.  Original patch by Claudiu Popa.
 +
 +- Issue #8743: Fix interoperability between set objects and the
 +  collections.Set() abstract base class.
 +
 +- Issue #21481:  Argparse equality and inequality tests now return 
 +  NotImplemented when comparing to an unknown type.
 +
 +Tests
 +-----
 +
 +- Issue #21493: Added test for ntpath.expanduser().  Original patch by
 +  Claudiu Popa.
 +
 +- Issue #19925: Added tests for the spwd module. Original patch by Vajrasky Kok.
 +
 +- Issue #13355: random.triangular() no longer fails with a ZeroDivisionError
 +  when low equals high.
 +
 +- Issue #21522: Added Tkinter tests for Listbox.itemconfigure(),
 +  PanedWindow.paneconfigure(), and Menu.entryconfigure().
 +
 +- Issue #20635: Added tests for Tk geometry managers.
 +
+ What's New in Python 2.7.7
+ ==========================
+ 
+ *Release date: 2014-05-31*
+ 
+ Build
+ -----
+ 
+ - Issue #21462: Build the Windows installers with OpenSSL 1.0.1g.
+ 
+ - Issue #19866: Include some test data in the Windows installers, so tests don't
+   fail.
+ 
  
  What's New in Python 2.7.7 release candidate 1?
  ===============================================