]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge from 2.7
authorSenthil Kumaran <orsenthil@gmail.com>
Tue, 26 Apr 2011 13:12:48 +0000 (21:12 +0800)
committerSenthil Kumaran <orsenthil@gmail.com>
Tue, 26 Apr 2011 13:12:48 +0000 (21:12 +0800)

Trivial merge