]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Tue, 15 Mar 2011 22:45:59 +0000 (18:45 -0400)
committerBrett Cannon <brett@python.org>
Tue, 15 Mar 2011 22:45:59 +0000 (18:45 -0400)

Trivial merge