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

Trivial merge