From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 7 Jun 2014 13:22:06 +0000 (+1000)
Subject: Merge issue #21667 from 3.4
X-Git-Tag: v3.5.0a1~1502
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2197a48053404fcfee1a84f002029654e3987d3;p=python

Merge issue #21667 from 3.4
---

e2197a48053404fcfee1a84f002029654e3987d3