From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 13 Mar 2011 18:16:03 +0000 (+0100)
Subject: Merge commit for #11233
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f74dee4b88977d696285049f8a4d86026a98090f;p=python

Merge commit for #11233
---

f74dee4b88977d696285049f8a4d86026a98090f