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

Trivial merge