]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSenthil Kumaran <senthil@uthcode.com>
Mon, 23 Apr 2012 15:56:36 +0000 (23:56 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Mon, 23 Apr 2012 15:56:36 +0000 (23:56 +0800)

Trivial merge