]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.1
authorBenjamin Peterson <benjamin@python.org>
Thu, 23 Feb 2012 15:54:28 +0000 (10:54 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 23 Feb 2012 15:54:28 +0000 (10:54 -0500)

Trivial merge