From: Raymond Hettinger <python@rcn.com>
Date: Mon, 10 Nov 2014 01:21:20 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.5.0a1~500^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87fc6f5c8e416f6b7ba068d792742cfd142ab673;p=python

merge
---

87fc6f5c8e416f6b7ba068d792742cfd142ab673