From: R David Murray <rdmurray@bitdance.com>
Date: Mon, 14 Mar 2011 21:14:29 +0000 (-0400)
Subject: Merge #11496 from 3.2.
X-Git-Tag: v3.3.0a1~2921^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=750beda5353e3433df3978b6e9e3d57b6253e066;p=thirdparty%2FPython%2Fcpython.git

Merge #11496 from 3.2.
---

750beda5353e3433df3978b6e9e3d57b6253e066