From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Aug 2012 04:50:11 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.0b2~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b685d19eb395dec1ead39df9770b1f77f332776f;p=python

merge heads
---

b685d19eb395dec1ead39df9770b1f77f332776f