]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
outstanding merge with 3.2
authorSenthil Kumaran <senthil@uthcode.com>
Mon, 20 Jun 2011 00:48:35 +0000 (17:48 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Mon, 20 Jun 2011 00:48:35 +0000 (17:48 -0700)

Trivial merge