From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 30 Oct 2013 16:43:44 +0000 (-0400)
Subject: merge 2.7.6 release branch
X-Git-Tag: v2.7.8~314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae7894c9538af13afdd816a59b0e2ffc96eb5627;p=python

merge 2.7.6 release branch
---

ae7894c9538af13afdd816a59b0e2ffc96eb5627