]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Mon, 25 Jun 2012 08:15:53 +0000 (01:15 -0700)
committerGregory P. Smith <greg@krypto.org>
Mon, 25 Jun 2012 08:15:53 +0000 (01:15 -0700)

Trivial merge