From: Raymond Hettinger <python@rcn.com>
Date: Mon, 23 Jun 2014 02:47:55 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1429
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef85df168ac4481d54ece0e7ba84ff7d48647e20;p=python

merge
---

ef85df168ac4481d54ece0e7ba84ff7d48647e20