]> granicus.if.org Git - python/commitdiff
Merge from 3.2
authorKurt B. Kaiser <kbk@shore.net>
Wed, 23 Mar 2011 00:05:18 +0000 (20:05 -0400)
committerKurt B. Kaiser <kbk@shore.net>
Wed, 23 Mar 2011 00:05:18 +0000 (20:05 -0400)

Trivial merge