]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 21 Feb 2012 16:23:21 +0000 (11:23 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 21 Feb 2012 16:23:21 +0000 (11:23 -0500)

Trivial merge