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

merge
---

47d1e2858eb26931fc76007d37204c379b3279bd