From: Raymond Hettinger <python@rcn.com>
Date: Mon, 26 May 2014 01:06:27 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1597
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa4ed0c145f2e17ccd59c2180cbf7be07c8c872d;p=thirdparty%2FPython%2Fcpython.git

merge
---

fa4ed0c145f2e17ccd59c2180cbf7be07c8c872d