]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge the changes.
authorSenthil Kumaran <orsenthil@gmail.com>
Thu, 14 Apr 2011 04:58:32 +0000 (12:58 +0800)
committerSenthil Kumaran <orsenthil@gmail.com>
Thu, 14 Apr 2011 04:58:32 +0000 (12:58 +0800)

Trivial merge