]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.1
authorBenjamin Peterson <benjamin@python.org>
Mon, 7 Mar 2011 00:04:10 +0000 (18:04 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 7 Mar 2011 00:04:10 +0000 (18:04 -0600)

Trivial merge