From: Barry Warsaw <barry@python.org>
Date: Mon, 30 Sep 2013 19:58:28 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.6rc1~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e85f4e317488da9b979def01e964a35d9ee6133c;p=python

merge heads
---

e85f4e317488da9b979def01e964a35d9ee6133c