]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 2.6
authorBenjamin Peterson <benjamin@python.org>
Wed, 29 Jun 2011 02:58:27 +0000 (21:58 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 29 Jun 2011 02:58:27 +0000 (21:58 -0500)

Trivial merge