From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 19 Mar 2013 06:28:07 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.4.0a1~1168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc41f552a2f1ba16e6a2fb2771ce127e3c693b40;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

dc41f552a2f1ba16e6a2fb2771ce127e3c693b40