]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 13 Mar 2011 00:35:48 +0000 (18:35 -0600)
committerBenjamin Peterson <benjamin@python.org>
Sun, 13 Mar 2011 00:35:48 +0000 (18:35 -0600)

Trivial merge