]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Sat, 14 Jan 2012 23:09:07 +0000 (15:09 -0800)
committerGregory P. Smith <greg@krypto.org>
Sat, 14 Jan 2012 23:09:07 +0000 (15:09 -0800)

Trivial merge