]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 02:39:38 +0000 (21:39 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 02:39:38 +0000 (21:39 -0500)

Trivial merge