From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 Jan 2012 21:32:36 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~303
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f99ce94703da719989e5cc47fe47b464f5c7514;p=python

merge heads
---

4f99ce94703da719989e5cc47fe47b464f5c7514