From: Brett Cannon <brett@python.org>
Date: Wed, 14 Nov 2012 20:22:56 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.4.0a1~2012
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f7e81a549674802ee13a2a217974d57751ac111;p=python

merge
---

6f7e81a549674802ee13a2a217974d57751ac111