From: Raymond Hettinger <python@rcn.com>
Date: Wed, 2 Oct 2013 04:38:37 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a4~300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75f65e368e04c6242c103d3139571b8aaad8b4be;p=thirdparty%2FPython%2Fcpython.git

merge
---

75f65e368e04c6242c103d3139571b8aaad8b4be