From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 29 Jul 2013 07:52:21 +0000 (+1000)
Subject: Merge #15415 from 3.3 (again)
X-Git-Tag: v3.4.0a1~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00dc61cd73813433b5295555382e489151bfced9;p=python

Merge #15415 from 3.3 (again)
---

00dc61cd73813433b5295555382e489151bfced9