From: Raymond Hettinger <python@rcn.com>
Date: Thu, 6 Nov 2014 05:28:19 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.5.0a1~513
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ac09cbe5e08205b56082cbbcba83d3f5220d6cf;p=python

merge
---

2ac09cbe5e08205b56082cbbcba83d3f5220d6cf