]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Sat, 17 Mar 2012 17:39:20 +0000 (18:39 +0100)
committerGeorg Brandl <georg@python.org>
Sat, 17 Mar 2012 17:39:20 +0000 (18:39 +0100)

Trivial merge