From: Raymond Hettinger <python@rcn.com>
Date: Wed, 13 May 2015 09:48:21 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0b1~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46cf02d25aeab175e70c087a53d10a47dc5df203;p=python

merge
---

46cf02d25aeab175e70c087a53d10a47dc5df203