From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 Apr 2012 14:08:20 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cf5aa910649bd831cad8f87963277025deb0695;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

1cf5aa910649bd831cad8f87963277025deb0695