]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 21 Jun 2011 02:40:34 +0000 (21:40 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 21 Jun 2011 02:40:34 +0000 (21:40 -0500)

Trivial merge