]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.1
authorBenjamin Peterson <benjamin@python.org>
Wed, 29 Jun 2011 02:49:40 +0000 (21:49 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 29 Jun 2011 02:49:40 +0000 (21:49 -0500)

Trivial merge