From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 4 Jan 2013 04:34:49 +0000 (-0800)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~424
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf064b391102b0cf1a79c08c64855a036c957650;p=python

merge 3.2
---

bf064b391102b0cf1a79c08c64855a036c957650