]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Trunk merge
authorBarry Warsaw <barry@python.org>
Fri, 7 Oct 2011 19:15:38 +0000 (15:15 -0400)
committerBarry Warsaw <barry@python.org>
Fri, 7 Oct 2011 19:15:38 +0000 (15:15 -0400)

Trivial merge