From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 Jan 2012 14:07:06 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.2.3rc1~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fa5a99b0693100077a556f05e3c6638b837389b;p=python

merge heads
---

7fa5a99b0693100077a556f05e3c6638b837389b