From: Raymond Hettinger <python@rcn.com>
Date: Sun, 1 Sep 2013 04:28:58 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a2~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=264683ef0a89d476cbba5b218cb5d999a05035a6;p=python

merge
---

264683ef0a89d476cbba5b218cb5d999a05035a6