From: Georg Brandl <georg@python.org>
Date: Sun, 25 Mar 2012 18:41:06 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a2~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87b3caf873a45fd836982296374f5b4e49dd9e30;p=python

merge with 3.2
---

87b3caf873a45fd836982296374f5b4e49dd9e30