From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 19 Feb 2014 16:46:05 +0000 (-0600)
Subject: Issue #20510: Merge with 3.3
X-Git-Tag: v3.4.1rc1~233^2~276^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d7ba5cd7b7a6f1a419dbf883a5110c640515852;p=python

Issue #20510: Merge with 3.3
---

1d7ba5cd7b7a6f1a419dbf883a5110c640515852