From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 24 Mar 2014 03:22:12 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~2037
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14017b2a53d790512659e3eca812c96e06ea79c8;p=python

Merge with 3.4
---

14017b2a53d790512659e3eca812c96e06ea79c8