From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 10 Jun 2014 17:08:20 +0000 (-0500)
Subject: Issue #21688: Merge with 3.4
X-Git-Tag: v3.5.0a1~1477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c4cde7829211bd565e4a045d4d9bda39cf9dab7;p=python

Issue #21688: Merge with 3.4
---

4c4cde7829211bd565e4a045d4d9bda39cf9dab7