From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 12 Apr 2011 23:35:21 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2606
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59c90c6cb24b91890dec4d39cf873944cac13c97;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

59c90c6cb24b91890dec4d39cf873944cac13c97