From: R David Murray <rdmurray@bitdance.com>
Date: Mon, 14 Mar 2011 13:58:59 +0000 (-0400)
Subject: Merge #11488 patch from 3.2.
X-Git-Tag: v3.3.0a1~2931
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af9be2006021783c4dcdf1918ddcd8961195aa3b;p=thirdparty%2FPython%2Fcpython.git

Merge #11488 patch from 3.2.
---

af9be2006021783c4dcdf1918ddcd8961195aa3b