From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 6 Sep 2011 11:57:26 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.2.3rc1~581
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f5556095eed7383e98c24766aa302c5e473abc1;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

7f5556095eed7383e98c24766aa302c5e473abc1