From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 29 Sep 2012 18:14:19 +0000 (-0400)
Subject: merge mostly from default
X-Git-Tag: v3.3.1rc1~818
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14fb44e1bab9db128770f1d91d244916a669e7c3;p=thirdparty%2FPython%2Fcpython.git

merge mostly from default
---

14fb44e1bab9db128770f1d91d244916a669e7c3