From: Raymond Hettinger <python@rcn.com>
Date: Tue, 24 Jun 2014 20:44:39 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1419^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21468dfa4d79632696a0128f7e3218d8e10528e9;p=python

merge
---

21468dfa4d79632696a0128f7e3218d8e10528e9