]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Tue, 15 Mar 2011 19:51:26 +0000 (15:51 -0400)
committerGregory P. Smith <greg@krypto.org>
Tue, 15 Mar 2011 19:51:26 +0000 (15:51 -0400)

Trivial merge