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

Trivial merge