]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Wed, 1 Jun 2011 23:18:00 +0000 (16:18 -0700)
committerRaymond Hettinger <python@rcn.com>
Wed, 1 Jun 2011 23:18:00 +0000 (16:18 -0700)

Trivial merge