From: Raymond Hettinger <python@rcn.com>
Date: Fri, 23 May 2014 02:47:11 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.5.0a1~1617
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3d58ae2f2bf586ed059cf3449c3075fde6135a4;p=python

merge
---

a3d58ae2f2bf586ed059cf3449c3075fde6135a4