]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSenthil Kumaran <senthil@uthcode.com>
Tue, 10 Apr 2012 19:18:25 +0000 (03:18 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Tue, 10 Apr 2012 19:18:25 +0000 (03:18 +0800)

Trivial merge