]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Sun, 25 Mar 2012 18:41:06 +0000 (20:41 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 25 Mar 2012 18:41:06 +0000 (20:41 +0200)

Trivial merge