From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 16 Aug 2011 22:46:44 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1691
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51be6e0a0f21ece0fbd6c046616c5b504246b70f;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

51be6e0a0f21ece0fbd6c046616c5b504246b70f