From: Georg Brandl <georg@python.org>
Date: Sun, 6 May 2012 10:06:24 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a4~262
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc7e967c48fc0e22069d1b9cd7fe1ceb88c25c4e;p=python

merge with 3.2
---

fc7e967c48fc0e22069d1b9cd7fe1ceb88c25c4e