From: Brian Curtin <brian@python.org>
Date: Tue, 14 Jun 2011 15:06:41 +0000 (-0500)
Subject: Merge 3.2 - update to the fix for #12084
X-Git-Tag: v3.3.0a1~2118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ff1a414f8a755036f889937d2703d6a7388904f;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2 - update to the fix for #12084
---

4ff1a414f8a755036f889937d2703d6a7388904f