]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Tue, 19 Apr 2011 18:11:20 +0000 (11:11 -0700)
committerRaymond Hettinger <python@rcn.com>
Tue, 19 Apr 2011 18:11:20 +0000 (11:11 -0700)

Trivial merge