]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 21 Jun 2011 00:24:31 +0000 (19:24 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 21 Jun 2011 00:24:31 +0000 (19:24 -0500)

Trivial merge