]> granicus.if.org Git - python/commitdiff
Merge 3.2 branch.
authorGeorg Brandl <georg@python.org>
Sat, 23 Jul 2011 06:06:00 +0000 (08:06 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 23 Jul 2011 06:06:00 +0000 (08:06 +0200)

Trivial merge