]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Thu, 15 Mar 2012 01:17:20 +0000 (18:17 -0700)
committerRaymond Hettinger <python@rcn.com>
Thu, 15 Mar 2012 01:17:20 +0000 (18:17 -0700)

Trivial merge