From: Raymond Hettinger <python@rcn.com>
Date: Fri, 4 Oct 2013 23:52:39 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a4~274
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07573d7b2418dd3a043c8fc95f40517fa4543048;p=thirdparty%2FPython%2Fcpython.git

merge
---

07573d7b2418dd3a043c8fc95f40517fa4543048