From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 1 Apr 2012 22:48:11 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a3~334^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29f843816bb6016ac673a3e0e4b3996fd235a152;p=python

merge heads
---

29f843816bb6016ac673a3e0e4b3996fd235a152