From: Nick Coghlan <ncoghlan@gmail.com>
Date: Wed, 16 Mar 2011 17:55:03 +0000 (-0400)
Subject: Merge fix for #11548 from 3.2
X-Git-Tag: v3.3.0a1~2891^2~13^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bfa67f380c1de301293a3ff4baeffb56b42b70c;p=thirdparty%2FPython%2Fcpython.git

Merge fix for #11548 from 3.2
---

7bfa67f380c1de301293a3ff4baeffb56b42b70c