From: Barry Warsaw <barry@python.org>
Date: Tue, 1 Oct 2013 15:39:08 +0000 (-0400)
Subject: 2.6 merge
X-Git-Tag: v2.7.6rc1~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3760d97f9b62be6d25a5530e35899d3612d7fb7b;p=python

2.6 merge
---

3760d97f9b62be6d25a5530e35899d3612d7fb7b