]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Tue, 27 Mar 2012 05:46:54 +0000 (07:46 +0200)
committerGeorg Brandl <georg@python.org>
Tue, 27 Mar 2012 05:46:54 +0000 (07:46 +0200)

Trivial merge