[Python-checkins] merge in cpython: Merge 3.2 branch into default.

[georg.brandl]

georg.brandl pushed 36eea3fd27ba to cpython:

http://hg.python.org/cpython/rev/36eea3fd27ba
changeset:   68038:36eea3fd27ba
parent:      68037:8f26680f6626
parent:      68033:cf8064cb5ac7
user:        Georg Brandl <georg at python.org>
date:        Sat Feb 26 07:42:50 2011 +0100
summary:
  Merge 3.2 branch into default.

files:
  .gitignore
  .hgtags
  Include/patchlevel.h
  Lib/collections/__init__.py
  Misc/NEWS
  Modules/zlibmodule.c

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -78,3 +78,4 @@
 34beaba435d572273f7c9d64df8da7de2451e643 v3.2rc1
 6a0868b10c630b0db6eacb3f6bd54e6e537f5a67 v3.2rc2
 918a09de82a51e66e7674354ef0b7e3b4cb5b438 v3.2rc3
+b9156af11ab1af9c9534a98e4cca03ba9079d247 v3.2
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -270,7 +270,7 @@
       e.submit(shutil.copy, 'src1.txt', 'dest1.txt')
       e.submit(shutil.copy, 'src2.txt', 'dest2.txt')
       e.submit(shutil.copy, 'src3.txt', 'dest3.txt')
-      e.submit(shutil.copy, 'src3.txt', 'dest4.txt')
+      e.submit(shutil.copy, 'src4.txt', 'dest4.txt')
 
 .. seealso::
 

--
Repository URL: http://hg.python.org/cpython