]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 14 Jul 2011 04:11:14 +0000 (23:11 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 14 Jul 2011 04:11:14 +0000 (23:11 -0500)

Trivial merge