From: Brett Cannon <brett@python.org>
Date: Sun, 28 Oct 2012 15:47:54 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~2151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a85f3cbe4b43860c527c43bd5da0220c4f96c0e;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.3
---

6a85f3cbe4b43860c527c43bd5da0220c4f96c0e