]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge from upstream
authorSkip Montanaro <skip@pobox.com>
Sat, 19 Mar 2011 18:03:33 +0000 (13:03 -0500)
committerSkip Montanaro <skip@pobox.com>
Sat, 19 Mar 2011 18:03:33 +0000 (13:03 -0500)

Trivial merge