From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 12 Dec 2013 16:33:27 +0000 (-0600)
Subject: Merge fix from 3.3
X-Git-Tag: v3.4.0b2~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fda4749e3c4636b38494e4d2302d43a53a64d4f;p=python

Merge fix from 3.3
---

8fda4749e3c4636b38494e4d2302d43a53a64d4f