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

merge
---

aba9bfed73a2c218e18254eb17e890ad4e1148a8