]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sat, 13 Aug 2011 04:35:46 +0000 (23:35 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 13 Aug 2011 04:35:46 +0000 (23:35 -0500)

Trivial merge