From: Barry Warsaw <barry@python.org>
Date: Fri, 10 May 2013 15:36:23 +0000 (-0400)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~755
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c01ffa6ede5da92ab144ad2ea609a96e308b1e6;p=python

Merge 3.3
---

8c01ffa6ede5da92ab144ad2ea609a96e308b1e6