]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Tue, 15 Mar 2011 20:11:04 +0000 (21:11 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Tue, 15 Mar 2011 20:11:04 +0000 (21:11 +0100)

Trivial merge