From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 9 Feb 2013 13:57:53 +0000 (-0500)
Subject: merge 3.3 (#17168)
X-Git-Tag: v3.4.0a1~1417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fde43ec5cc32577a3f5c538bf9ac10ccadb9df55;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#17168)
---

fde43ec5cc32577a3f5c538bf9ac10ccadb9df55