From: Raymond Hettinger <python@rcn.com>
Date: Sat, 25 Jun 2011 09:52:37 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.3.0a1~2056
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f20dd53698c9fd2ef1246cb194ed9cded7ff658a;p=python

merge
---

f20dd53698c9fd2ef1246cb194ed9cded7ff658a