]> granicus.if.org Git - python/commitdiff
merge heads
authorGregory P. Smith <greg@krypto.org>
Sun, 22 Jul 2012 04:23:00 +0000 (21:23 -0700)
committerGregory P. Smith <greg@krypto.org>
Sun, 22 Jul 2012 04:23:00 +0000 (21:23 -0700)

Trivial merge