]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads.
authorSenthil Kumaran <senthil@uthcode.com>
Sun, 31 Jul 2011 01:14:53 +0000 (09:14 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Sun, 31 Jul 2011 01:14:53 +0000 (09:14 +0800)

Trivial merge