From: Brett Cannon <brett@python.org>
Date: Fri, 15 Jun 2012 23:04:29 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.3.0b1~237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24aa693c7ef8f217fbd238eb7af7d828e13a07eb;p=python

Merge
---

24aa693c7ef8f217fbd238eb7af7d828e13a07eb