]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 31 Jul 2011 03:08:18 +0000 (22:08 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 31 Jul 2011 03:08:18 +0000 (22:08 -0500)

Trivial merge