]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorBrett Cannon <brett@python.org>
Thu, 17 Mar 2011 18:16:38 +0000 (11:16 -0700)
committerBrett Cannon <brett@python.org>
Thu, 17 Mar 2011 18:16:38 +0000 (11:16 -0700)

Trivial merge