]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 11 Jun 2012 07:42:17 +0000 (00:42 -0700)
committerRaymond Hettinger <python@rcn.com>
Mon, 11 Jun 2012 07:42:17 +0000 (00:42 -0700)

Trivial merge