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

merge
---

ea2b007b4431f65873efabc4eb0c271ff7d161b8