]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSenthil Kumaran <senthil@uthcode.com>
Thu, 20 Oct 2011 16:34:27 +0000 (00:34 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Thu, 20 Oct 2011 16:34:27 +0000 (00:34 +0800)

Trivial merge