From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 29 Oct 2013 22:18:52 +0000 (-0400)
Subject: merge 2.7.6 branch
X-Git-Tag: v2.7.8~315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=285e2e8403fb71e305146dc5cc98ad2d350cbaad;p=python

merge 2.7.6 branch
---

285e2e8403fb71e305146dc5cc98ad2d350cbaad