From: Barry Warsaw <barry@python.org>
Date: Fri, 23 Aug 2013 17:38:02 +0000 (-0400)
Subject: null merge with 2.6
X-Git-Tag: v2.7.6rc1~204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=537f15645a42799594dc735545bcdad79f8ebd9c;p=thirdparty%2FPython%2Fcpython.git

null merge with 2.6
---

537f15645a42799594dc735545bcdad79f8ebd9c