From: Raymond Hettinger <python@rcn.com>
Date: Wed, 1 Jun 2011 23:18:00 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~2183^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f6a7323d38af2c478896072a1edd6a3b88bf02e;p=python

merge
---

0f6a7323d38af2c478896072a1edd6a3b88bf02e