From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 3 Aug 2011 03:09:56 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1758
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0fc9c4d0af00e002a6a9b43563c447281313950;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

b0fc9c4d0af00e002a6a9b43563c447281313950