Merge 3.2

diff --cc Lib/shutil.py
index 9ba602f1ecd2f1775c0fa46fcb4e4675a9509a96,a0d981b0c7278965d5cc9cb11960186cf6566bf7..2955b048b879b046de02a5894c36abdc9b25c7ca
--- 1/Lib/shutil.py
--- 2/Lib/shutil.py
+++ b/Lib/shutil.py
@@@ -34,8 -34,7 +34,9 @@@ __all__ = ["copyfileobj", "copyfile", "
             "ExecError", "make_archive", "get_archive_formats",
             "register_archive_format", "unregister_archive_format",
             "get_unpack_formats", "register_unpack_format",
-            "unregister_unpack_format", "unpack_archive"]
 -           "unregister_unpack_format", "unpack_archive", "ignore_patterns"]
++           "unregister_unpack_format", "unpack_archive",
++           "ignore_patterns"]
 +           # disk_usage is added later, if available on the platform
  
  class Error(EnvironmentError):
      pass