Merge branch 3.2 (closes #13338)

diff --cc Misc/ACKS
index 986debd4b65f518b6c261cc71916c487f8bd6cf7,c66edb7ab175e99e845dde811df22bcd6fa7a5c6..acf214746ec97539fce15b16d1d87eb31287923e
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -132,9 -124,9 +132,10 @@@ Titus Brow
  Oleg Broytmann
  Dave Brueck
  Francisco Martín Brugué
+ Floris Bruynooghe
  Stan Bubrouski
  Erik de Bueger
 +Jan-Hein Bührman
  Dick Bulterman
  Bill Bumgarner
  Jimmy Burgett

diff --cc Misc/NEWS
index 183e4ed49a5e461e5833b82d3dc176e6e27efd33,c3765dd973bda544b6e6cf4be7ddc0d4ac80bd4d..90c0f3b55671179e7c31155bd7d3a9f5f496341f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,14 -10,10 +10,18 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER
+   to allow compiling extension modules with -Wswitch-enum on gcc.
+   Initial patch by Floris Bruynooghe.
+ 
 +- Issue #10227: Add an allocation cache for a single slice object.  Patch by
 +  Stefan Behnel.
 +
 +- Issue #13393: BufferedReader.read1() now asks the full requested size to
 +  the raw stream instead of limiting itself to the buffer size.
 +
 +- Issue #13392: Writing a pyc file should now be atomic under Windows as well.
 +
  - Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder
    already accepts them).