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

Trivial merge