From: Georg Brandl <georg@python.org>
Date: Sun, 28 Oct 2012 09:51:46 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.1rc1~729^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b9561d1f1548787e518934aea02fad8a0391ab5;p=python

merge with 3.2
---

5b9561d1f1548787e518934aea02fad8a0391ab5