From: Raymond Hettinger <python@rcn.com>
Date: Wed, 13 Apr 2011 01:35:16 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~2603^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2353aab474405eebdeee6a1b2af64aaff3095e9;p=python

merge
---

a2353aab474405eebdeee6a1b2af64aaff3095e9