From: Georg Brandl <georg@python.org>
Date: Fri, 24 Aug 2012 16:15:46 +0000 (+0200)
Subject: Closes #9374: merge with 3.2
X-Git-Tag: v3.3.0rc1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=491b1dc79efd4d3fc39b0ded2cd3fd746154b882;p=python

Closes #9374: merge with 3.2
---

491b1dc79efd4d3fc39b0ded2cd3fd746154b882