]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:30:29 +0000 (16:30 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:30:29 +0000 (16:30 -0500)

Trivial merge