From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 4 Jan 2013 04:34:40 +0000 (-0800)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~424^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d73f369f4c52e921ba225043c0a820856369ef44;p=python

merge heads
---

d73f369f4c52e921ba225043c0a820856369ef44