From: Tim Peters <tim@python.org>
Date: Sun, 25 Aug 2013 16:53:55 +0000 (-0500)
Subject: Null merge of 2.6 into 2.7.
X-Git-Tag: v2.7.6rc1~193
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8ceef4b47ceb0181394e95c4ac1a38824a864f2;p=thirdparty%2FPython%2Fcpython.git

Null merge of 2.6 into 2.7.

Changeset 50803d881a92 left a new dangling head on 2.6, and the
change was applied separately to 2.7 in changeset 1cd24ea5abeb.
---

a8ceef4b47ceb0181394e95c4ac1a38824a864f2