From: Georg Brandl <georg@python.org>
Date: Wed, 14 Mar 2012 21:42:49 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a2~190^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30162be9e463df2f9d50dcab14932999e2b5b5fe;p=python

merge with 3.2
---

30162be9e463df2f9d50dcab14932999e2b5b5fe