]> granicus.if.org Git - python/commitdiff
Merge 3.1
authorKristjan Valur Jonsson <sweskman@gmail.com>
Wed, 30 Mar 2011 11:54:13 +0000 (11:54 +0000)
committerKristjan Valur Jonsson <sweskman@gmail.com>
Wed, 30 Mar 2011 11:54:13 +0000 (11:54 +0000)

Trivial merge