From: Barry Warsaw <barry@python.org>
Date: Fri, 19 Apr 2013 15:32:54 +0000 (-0400)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~880
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24aa15959b0f8b540dc4c2eacf31755e506ab3b5;p=python

Merge 3.3
---

24aa15959b0f8b540dc4c2eacf31755e506ab3b5