]> granicus.if.org Git - python/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Sat, 14 May 2011 22:33:43 +0000 (15:33 -0700)
committerGregory P. Smith <greg@krypto.org>
Sat, 14 May 2011 22:33:43 +0000 (15:33 -0700)

Trivial merge