From: Georg Brandl <georg@python.org>
Date: Sat, 17 Mar 2012 16:29:39 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a2~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=869ac7895f0cadb714bb2bd1c601d06b03102010;p=python

merge with 3.2
---

869ac7895f0cadb714bb2bd1c601d06b03102010