From: Raymond Hettinger <python@rcn.com>
Date: Mon, 11 Jun 2012 07:42:17 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0b1~242
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c4acd8bf9b7f2e1dcfd5bb76c4562451c3d8fa1;p=python

merge
---

3c4acd8bf9b7f2e1dcfd5bb76c4562451c3d8fa1