]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sat, 25 Jun 2011 09:52:37 +0000 (11:52 +0200)
committerRaymond Hettinger <python@rcn.com>
Sat, 25 Jun 2011 09:52:37 +0000 (11:52 +0200)

Trivial merge