]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.1
authorBenjamin Peterson <benjamin@python.org>
Sat, 11 Jun 2011 16:34:31 +0000 (11:34 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 11 Jun 2011 16:34:31 +0000 (11:34 -0500)

Trivial merge