From: Gregory P. Smith <greg@krypto.org>
Date: Sun, 5 Jun 2011 06:05:19 +0000 (-0700)
Subject: merge heads.
X-Git-Tag: v3.3.0a1~2183
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d64b2bae9b4d1b761cd16f75e3fe3e9c19533b3e;p=python

merge heads.
---

d64b2bae9b4d1b761cd16f75e3fe3e9c19533b3e