]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Sun, 25 Dec 2011 18:03:22 +0000 (19:03 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 25 Dec 2011 18:03:22 +0000 (19:03 +0100)

Trivial merge