From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 19 Mar 2014 19:47:49 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~2077
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26e417b1821c2f5d27a81d9733273522b5d21c31;p=python

Merge with 3.4
---

26e417b1821c2f5d27a81d9733273522b5d21c31