]> granicus.if.org Git - python/commitdiff
Merge from 3.1 again
authorKurt B. Kaiser <kbk@shore.net>
Fri, 25 Mar 2011 04:30:40 +0000 (00:30 -0400)
committerKurt B. Kaiser <kbk@shore.net>
Fri, 25 Mar 2011 04:30:40 +0000 (00:30 -0400)

Trivial merge