From: Raymond Hettinger <python@rcn.com>
Date: Mon, 19 May 2014 06:34:08 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.5.0a1~1629
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22f2da3cccd310cd0b74cfa716685d307db2f960;p=python

merge
---

22f2da3cccd310cd0b74cfa716685d307db2f960