From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 2 Jan 2013 18:23:05 +0000 (-0600)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1708
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13a2707f95fe0c56772fffc6d915d857929564a2;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

13a2707f95fe0c56772fffc6d915d857929564a2