From: R David Murray <rdmurray@bitdance.com>
Date: Sun, 20 Mar 2011 14:25:29 +0000 (-0400)
Subject: Really merge #7198
X-Git-Tag: v3.2.1b1~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb8b06736008054ae72630aea5a2f3a3db2052f5;p=python

Really merge #7198

Changeset ab27f16f707a was messed up by a rebase (as were
959f666470cc and 9d1b1a95bc8f) and the patch only got applied
to default.
---

fb8b06736008054ae72630aea5a2f3a3db2052f5