Merge heads

diff --cc Misc/NEWS
index da04ba56580e20f6d8e719a2cc5538fd4f126dfa,1b8d0cb7195d6842337fce1562bec96d8d27ea69..c60cea0bbdfb5d55e538a55988f948de7978c83e
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -10,12 +10,16 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
 +- Issue #11849: Ensure that free()d memory arenas are really released
 +  on POSIX systems supporting anonymous memory mappings.  Patch by
 +  Charles-François Natali.
 +
+ - Issue #13452: PyUnicode_EncodeDecimal() doesn't support error handlers
+   different than "strict" anymore. The caller was unable to compute the
+   size of the output buffer: it depends on the error handler.
+ 
+ - PEP 3155 / issue #13448: Qualified name for classes and functions.
+ 
  - Issue #13436: Fix a bogus error message when an AST object was passed
    an invalid integer value.