]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Fri, 27 Jan 2012 00:09:44 +0000 (19:09 -0500)
committerBrett Cannon <brett@python.org>
Fri, 27 Jan 2012 00:09:44 +0000 (19:09 -0500)

Trivial merge