From: Raymond Hettinger <python@rcn.com>
Date: Tue, 24 Jun 2014 20:51:42 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.2rc1~326^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16f08355ce8ea8b754cb95933a3dfaf24fd2544b;p=python

merge
---

16f08355ce8ea8b754cb95933a3dfaf24fd2544b