]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Wed, 14 Mar 2012 21:42:49 +0000 (22:42 +0100)
committerGeorg Brandl <georg@python.org>
Wed, 14 Mar 2012 21:42:49 +0000 (22:42 +0100)

Trivial merge