merge from 3.2

diff --cc Misc/NEWS
index 742c86bae919b53bbf52b60fd2d031c1936e9844,856eae4cf4aa2df30f0e5db793e42094128e1415..1377e5964daf5402214d7807dfb120f121232e4b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,25 -2,17 +2,28 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.2.4
 -==========================
 +What's New in Python 3.3.1?
 +===========================
 +
 +*Not yet released, see sections below for changes released in 3.3.0*
  
- .. *Release date: XX-XXX-2012*
 -*Release date: XX-XX-XXXX*
++.. *Release date: 2013-XX-XX*
  
  Core and Builtins
  -----------------
  
 +- Issue #17328: Fix possible refleak in dict.setdefault.
 +
 +- Issue #17223: array module: Fix a crasher when converting an array containing
 +  invalid characters (outside range [U+0000; U+10ffff]) to Unicode:
 +  repr(array), str(array) and array.tounicode(). Patch written by Manuel Jacob.
 +
 +- Issue #17223: Fix PyUnicode_FromUnicode() for string of 1 character outside
 +  the range U+0000-U+10ffff.
 +
+ - Issue #1692335: Move initial args assignment to
+   BaseException.__new__ to help pickling of naive subclasses.
+ 
  - Issue #17275: Corrected class name in init error messages of the C version of
    BufferedWriter and BufferedRandom.