]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 23 Nov 2011 01:06:23 +0000 (19:06 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 23 Nov 2011 01:06:23 +0000 (19:06 -0600)

Trivial merge