From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 15 Mar 2012 20:38:17 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a2~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e259c80947513c564d7a9e2b6f8b47a69f61d14;p=python

merge heads
---

5e259c80947513c564d7a9e2b6f8b47a69f61d14