From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 1 Jan 2013 03:44:06 +0000 (-0600)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1727
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca319cf94eec0061b5c433fb0d54fd651b385a92;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

ca319cf94eec0061b5c433fb0d54fd651b385a92