From: Brett Cannon <brett@python.org>
Date: Sat, 21 Apr 2012 22:53:14 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a3~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b582c923ba4b0833e840360994743b68e0dfe219;p=thirdparty%2FPython%2Fcpython.git

merge
---

b582c923ba4b0833e840360994743b68e0dfe219