From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 16 Jun 2014 09:49:12 +0000 (+1000)
Subject: Merge issue #21669 from 3.4
X-Git-Tag: v3.5.0a1~1443^2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26171993fe629c614e62c7aef1196c0f53a30d85;p=python

Merge issue #21669 from 3.4
---

26171993fe629c614e62c7aef1196c0f53a30d85