]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 5 Jul 2011 03:28:00 +0000 (22:28 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 5 Jul 2011 03:28:00 +0000 (22:28 -0500)

Trivial merge