]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Thu, 20 Oct 2011 16:43:12 +0000 (09:43 -0700)
committerRaymond Hettinger <python@rcn.com>
Thu, 20 Oct 2011 16:43:12 +0000 (09:43 -0700)

Trivial merge