From: Raymond Hettinger <python@rcn.com>
Date: Thu, 5 May 2011 21:16:16 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~2393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b48432a77c9a3e902e28fa654882f04c38423fd;p=python

merge
---

7b48432a77c9a3e902e28fa654882f04c38423fd