From: Raymond Hettinger <python@rcn.com>
Date: Sun, 7 Apr 2013 03:28:05 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a1~1017^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a2ea9c592feae00452f16e9507be37c8bcb8cea;p=python

merge
---

1a2ea9c592feae00452f16e9507be37c8bcb8cea