]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 15 Dec 2011 20:57:47 +0000 (15:57 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 15 Dec 2011 20:57:47 +0000 (15:57 -0500)

Trivial merge