]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorGiampaolo Rodola' <g.rodola@gmail.com>
Sat, 7 May 2011 17:35:36 +0000 (19:35 +0200)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Sat, 7 May 2011 17:35:36 +0000 (19:35 +0200)

Trivial merge