]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Thu, 28 Apr 2011 22:49:33 +0000 (00:49 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Thu, 28 Apr 2011 22:49:33 +0000 (00:49 +0200)

Trivial merge