]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSenthil Kumaran <senthil@uthcode.com>
Sun, 8 Jul 2012 08:33:19 +0000 (01:33 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Sun, 8 Jul 2012 08:33:19 +0000 (01:33 -0700)

Trivial merge