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

Trivial merge