From: Raymond Hettinger <python@rcn.com>
Date: Sun, 10 Aug 2014 17:41:52 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1090
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed16b2e5ab8f134763d44b5b1eb9fc57717f5f1b;p=python

merge
---

ed16b2e5ab8f134763d44b5b1eb9fc57717f5f1b