From: Eric V. Smith <eric@trueblade.com>
Date: Mon, 12 Mar 2012 22:29:06 +0000 (-0700)
Subject: Merge heads.
X-Git-Tag: v3.3.0a2~234^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2bb8898eac404301821c2d1cae9f9614d9bde29;p=python

Merge heads.
---

f2bb8898eac404301821c2d1cae9f9614d9bde29