]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorJesus Cea <jcea@jcea.es>
Wed, 20 Apr 2011 20:38:26 +0000 (22:38 +0200)
committerJesus Cea <jcea@jcea.es>
Wed, 20 Apr 2011 20:38:26 +0000 (22:38 +0200)

Trivial merge