]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Sun, 24 Jun 2012 07:24:31 +0000 (00:24 -0700)
committerGregory P. Smith <greg@krypto.org>
Sun, 24 Jun 2012 07:24:31 +0000 (00:24 -0700)

Trivial merge