]> granicus.if.org Git - python/commitdiff
Merge with 3.2.
authorGeorg Brandl <georg@python.org>
Mon, 8 Aug 2011 19:45:24 +0000 (21:45 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 8 Aug 2011 19:45:24 +0000 (21:45 +0200)

Trivial merge