From: Raymond Hettinger <python@rcn.com>
Date: Wed, 25 Jun 2014 01:07:14 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.2rc1~326
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d21beaefc5af8f8257abfae9a29ccf438666674c;p=python

merge
---

d21beaefc5af8f8257abfae9a29ccf438666674c