From: Raymond Hettinger <python@rcn.com>
Date: Sun, 15 Jun 2014 21:50:39 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1443^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f46933a42ffb5e164624900a9d70dace7fe543ae;p=python

merge
---

f46933a42ffb5e164624900a9d70dace7fe543ae