]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merged
authorBarry Warsaw <barry@python.org>
Tue, 15 Mar 2011 19:23:56 +0000 (15:23 -0400)
committerBarry Warsaw <barry@python.org>
Tue, 15 Mar 2011 19:23:56 +0000 (15:23 -0400)

Trivial merge