From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 15 Mar 2011 19:45:20 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2905^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e97a5b2bda0b1b0352137e564a93e0176b6619e5;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

e97a5b2bda0b1b0352137e564a93e0176b6619e5