]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 2.6
authorBarry Warsaw <barry@python.org>
Thu, 15 Mar 2012 00:18:46 +0000 (17:18 -0700)
committerBarry Warsaw <barry@python.org>
Thu, 15 Mar 2012 00:18:46 +0000 (17:18 -0700)

Trivial merge