From: Raymond Hettinger <python@rcn.com>
Date: Wed, 14 May 2014 05:21:04 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1661
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=acddff6f28ea6696f54d3e8174c2b6cb576dcf5e;p=python

merge
---

acddff6f28ea6696f54d3e8174c2b6cb576dcf5e