]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSenthil Kumaran <senthil@uthcode.com>
Mon, 20 Jun 2011 14:37:03 +0000 (07:37 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Mon, 20 Jun 2011 14:37:03 +0000 (07:37 -0700)

Trivial merge