From: Raymond Hettinger <python@rcn.com>
Date: Fri, 3 May 2013 09:41:02 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a1~816
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4072875dcbdd60d27ec406eb3abe74f41c1be158;p=python

merge
---

4072875dcbdd60d27ec406eb3abe74f41c1be158