From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 17 Jan 2014 15:00:36 +0000 (-0600)
Subject: Issue #20266: Merge with 3.3
X-Git-Tag: v3.4.0b3~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77007344d90f6f58ab0c3ccb014fa8023dc9a0ce;p=python

Issue #20266: Merge with 3.3
---

77007344d90f6f58ab0c3ccb014fa8023dc9a0ce