]> granicus.if.org Git - python/commitdiff
Merge heads
authorKurt B. Kaiser <kbk@shore.net>
Wed, 11 May 2011 18:02:13 +0000 (14:02 -0400)
committerKurt B. Kaiser <kbk@shore.net>
Wed, 11 May 2011 18:02:13 +0000 (14:02 -0400)

Trivial merge