From: Tim Peters <tim@python.org>
Date: Tue, 3 Sep 2013 16:39:06 +0000 (-0500)
Subject: Null merge of 2.6 into 2.7.
X-Git-Tag: v2.7.6rc1~179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab70a7dc41d697ba597aa271f2aea191f6734932;p=thirdparty%2FPython%2Fcpython.git

Null merge of 2.6 into 2.7.

Changeset 25683ceaf341 left a new head on 2.6.
---

ab70a7dc41d697ba597aa271f2aea191f6734932