]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 20 Mar 2012 20:10:36 +0000 (16:10 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 20 Mar 2012 20:10:36 +0000 (16:10 -0400)

Trivial merge