From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 28 Dec 2011 18:01:51 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v3.3.0a1~511
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2f1db5355950fbad170b34750aff1c6074df949;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

d2f1db5355950fbad170b34750aff1c6074df949