From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 Jul 2011 03:44:14 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1806
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a06c029ce9c0d395dc27773403213bf0becbac3b;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

a06c029ce9c0d395dc27773403213bf0becbac3b