]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Thu, 26 Jan 2012 13:58:19 +0000 (08:58 -0500)
committerBrett Cannon <brett@python.org>
Thu, 26 Jan 2012 13:58:19 +0000 (08:58 -0500)

Trivial merge