]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 2 May 2011 18:03:37 +0000 (11:03 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 2 May 2011 18:03:37 +0000 (11:03 -0700)

Trivial merge