]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 3 Aug 2011 13:54:44 +0000 (08:54 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 3 Aug 2011 13:54:44 +0000 (08:54 -0500)

Trivial merge