]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Sun, 25 Mar 2012 06:43:32 +0000 (08:43 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 25 Mar 2012 06:43:32 +0000 (08:43 +0200)

Trivial merge