]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Null merge from 2.6.
authorBarry Warsaw <barry@python.org>
Sat, 4 Jun 2011 00:07:41 +0000 (20:07 -0400)
committerBarry Warsaw <barry@python.org>
Sat, 4 Jun 2011 00:07:41 +0000 (20:07 -0400)

Trivial merge