From: Jesus Cea <jcea@jcea.es>
Date: Wed, 20 Apr 2011 18:32:52 +0000 (+0200)
Subject: MERGE: Up-port changeset 5cf8f6da8743 (closes #11890)
X-Git-Tag: v3.2.1b1~97^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7124f5f7e898eea5ff533ca2d501dfb1e8a31e69;p=python

MERGE: Up-port changeset 5cf8f6da8743 (closes #11890)
---

7124f5f7e898eea5ff533ca2d501dfb1e8a31e69