]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
null merge from 2.6
authorBarry Warsaw <barry@python.org>
Sat, 17 Mar 2012 22:23:22 +0000 (18:23 -0400)
committerBarry Warsaw <barry@python.org>
Sat, 17 Mar 2012 22:23:22 +0000 (18:23 -0400)

Trivial merge