From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 6 Apr 2012 17:20:39 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a3~293^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=403bb39d1d964d7d75965649d2e8ffa1f9097b48;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

403bb39d1d964d7d75965649d2e8ffa1f9097b48