]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 28 Dec 2011 18:01:51 +0000 (12:01 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 28 Dec 2011 18:01:51 +0000 (12:01 -0600)

Trivial merge