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

Trivial merge