From: Brian Curtin <brian@python.org>
Date: Mon, 7 Nov 2011 20:19:46 +0000 (-0600)
Subject: branch merge
X-Git-Tag: v3.3.0a1~914
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca0fbc02e9971ead5436473e15320652c1fd97c8;p=thirdparty%2FPython%2Fcpython.git

branch merge
---

ca0fbc02e9971ead5436473e15320652c1fd97c8