]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorguido@google.com <guido@google.com>
Tue, 29 Mar 2011 19:09:45 +0000 (12:09 -0700)
committerguido@google.com <guido@google.com>
Tue, 29 Mar 2011 19:09:45 +0000 (12:09 -0700)

Trivial merge