From: Georg Brandl <georg@python.org>
Date: Sun, 22 Jan 2012 20:31:39 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20f6bc20bd3024b1b710d2833a74f2a7f2ba8571;p=python

merge with 3.2
---

20f6bc20bd3024b1b710d2833a74f2a7f2ba8571