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

merge 3.2
---

0de5fc51ff66838b5133bf4656af6a3023232b1c