]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 27 Jun 2011 14:16:14 +0000 (09:16 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 27 Jun 2011 14:16:14 +0000 (09:16 -0500)

Trivial merge