]> granicus.if.org Git - python/commitdiff
Merge 3.2 heads
authorKurt B. Kaiser <kbk@shore.net>
Fri, 25 Mar 2011 04:22:09 +0000 (00:22 -0400)
committerKurt B. Kaiser <kbk@shore.net>
Fri, 25 Mar 2011 04:22:09 +0000 (00:22 -0400)

Trivial merge