From: R David Murray <rdmurray@bitdance.com>
Date: Mon, 14 Mar 2011 13:57:03 +0000 (-0400)
Subject: Merge #11488 patch from 3.1.
X-Git-Tag: v3.2.1b1~311
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a5201f80d2293cd5ab83f4f3a751fb508f64ea7;p=thirdparty%2FPython%2Fcpython.git

Merge #11488 patch from 3.1.
---

1a5201f80d2293cd5ab83f4f3a751fb508f64ea7