merge 3.2

diff --cc Lib/test/test_descr.py
Simple merge

diff --cc Misc/NEWS
index 01b95e231005bcfe64b4d504d71761ec44d7fc1b,fac8078edbe9e5e49dc785259996cedc79d75677..22c3cf4fa61e0de9a4bba02e9ab2b93f300cfdc0
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,6 -10,28 +10,9 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
 -Library
 --------
 -
+ - Correct lookup of __dir__ on objects. Among other things, this causes errors
+   besides AttributeError found on lookup to be propagated.
+ 
 -- Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore
 -  to be able to unload the module.
 -
 -- Issue #12065: connect_ex() on an SSL socket now returns the original errno
 -  when the socket's timeout expires (it used to return None).
 -
 -
 -
 -What's New in Python 3.2.1 release candidate 1?
 -===============================================
 -
 -*Release date: 15-May-2011*
 -
 -Core and Builtins
 ------------------
 -
  - Issue #12060: Use sig_atomic_t type and volatile keyword in the signal
    module. Patch written by Charles-François Natali.
  

diff --cc Objects/object.c
Simple merge