From: Raymond Hettinger <python@rcn.com>
Date: Mon, 6 May 2013 02:54:04 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a1~793
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77371a5eea6b4a628a07b239333cbe3c3f4b13f6;p=python

merge
---

77371a5eea6b4a628a07b239333cbe3c3f4b13f6