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

merge heads
---

9b9c708de1465b15d4fcebb7c6250e23be151995