From: Georg Brandl <georg@python.org>
Date: Wed, 25 Jan 2012 21:36:43 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~302
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0f30c9891a3ef45d616bf3ae73d764fd539946b;p=python

merge with 3.2
---

b0f30c9891a3ef45d616bf3ae73d764fd539946b