From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 26 Nov 2013 20:55:46 +0000 (-0600)
Subject: Merge heads
X-Git-Tag: v2.7.8~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a57009b04d01b7c2e72ee67f9ab4ce62c64167d;p=python

Merge heads
---

2a57009b04d01b7c2e72ee67f9ab4ce62c64167d