From: Michael Foord <michael@voidspace.org.uk>
Date: Mon, 11 Feb 2013 13:33:00 +0000 (+0000)
Subject: Merge. Closes issue 17052.
X-Git-Tag: v3.4.0a1~1394
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=890d72d3c9896812a4bb07e785b273d1e6b001b0;p=python

Merge. Closes issue 17052.
---

890d72d3c9896812a4bb07e785b273d1e6b001b0