]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorRaymond Hettinger <python@rcn.com>
Wed, 23 Mar 2011 19:53:32 +0000 (12:53 -0700)
committerRaymond Hettinger <python@rcn.com>
Wed, 23 Mar 2011 19:53:32 +0000 (12:53 -0700)

Trivial merge