]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSenthil Kumaran <senthil@uthcode.com>
Sun, 3 Jun 2012 08:16:39 +0000 (16:16 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Sun, 3 Jun 2012 08:16:39 +0000 (16:16 +0800)

Trivial merge