]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads.
authorSenthil Kumaran <senthil@uthcode.com>
Tue, 2 Aug 2011 23:44:46 +0000 (07:44 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Tue, 2 Aug 2011 23:44:46 +0000 (07:44 +0800)

Trivial merge