]> granicus.if.org Git - python/commitdiff
Merge with 3.2.
authorGeorg Brandl <georg@python.org>
Sat, 16 Apr 2011 15:07:06 +0000 (17:07 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 16 Apr 2011 15:07:06 +0000 (17:07 +0200)

Trivial merge