From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 29 Oct 2013 20:24:26 +0000 (-0400)
Subject: merge 2.7.6 release branch
X-Git-Tag: v2.7.8~317
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e44e3f27024880798e35d1b7940635db1b9cdab;p=python

merge 2.7.6 release branch
---

3e44e3f27024880798e35d1b7940635db1b9cdab