]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 11 Aug 2011 19:46:49 +0000 (14:46 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 11 Aug 2011 19:46:49 +0000 (14:46 -0500)

Trivial merge