]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSenthil Kumaran <senthil@uthcode.com>
Wed, 3 Aug 2011 10:45:02 +0000 (18:45 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Wed, 3 Aug 2011 10:45:02 +0000 (18:45 +0800)

Trivial merge