From: Raymond Hettinger <python@rcn.com>
Date: Wed, 25 Jun 2014 04:39:27 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1414
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee205dc7d834ce33e245b46cecc9e15ea73aaefb;p=thirdparty%2FPython%2Fcpython.git

merge
---

ee205dc7d834ce33e245b46cecc9e15ea73aaefb