From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Oct 2012 23:02:18 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~708
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e5bbfb69b5c0eb2f72c3e1ec702f9363defe05f;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

5e5bbfb69b5c0eb2f72c3e1ec702f9363defe05f