]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 28 Sep 2011 14:48:40 +0000 (10:48 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 28 Sep 2011 14:48:40 +0000 (10:48 -0400)

Trivial merge