From: Raymond Hettinger <python@rcn.com>
Date: Sat, 21 Jun 2014 18:59:46 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1441^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=986efa074e26ae135387dcbba013503fd718fac7;p=python

merge
---

986efa074e26ae135387dcbba013503fd718fac7