]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorR David Murray <rdmurray@bitdance.com>
Thu, 10 Mar 2011 23:15:25 +0000 (18:15 -0500)
committerR David Murray <rdmurray@bitdance.com>
Thu, 10 Mar 2011 23:15:25 +0000 (18:15 -0500)

Trivial merge