]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 3 Jul 2011 18:45:33 +0000 (13:45 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 3 Jul 2011 18:45:33 +0000 (13:45 -0500)

Trivial merge