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

merge with 3.2
---

1a7742eb4d7960c72fc1be794c988d648e5ef139