From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 12 Mar 2012 16:28:26 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.0a2~234^2~17^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=800b3aa57f073403ed2b64c49058e9b88ba582d3;p=python

merge heads
---

800b3aa57f073403ed2b64c49058e9b88ba582d3