]> granicus.if.org Git - python/commitdiff
Merge 3.1
authorKurt B. Kaiser <kbk@shore.net>
Thu, 24 Mar 2011 17:19:35 +0000 (13:19 -0400)
committerKurt B. Kaiser <kbk@shore.net>
Thu, 24 Mar 2011 17:19:35 +0000 (13:19 -0400)

Trivial merge