From: Eric V. Smith <eric@trueblade.com>
Date: Thu, 28 Jun 2012 10:15:30 +0000 (-0400)
Subject: Merge.
X-Git-Tag: v3.3.0b2~375
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abb755db11b8f5a5a0b9c97540e3fb4e161e1894;p=python

Merge.
---

abb755db11b8f5a5a0b9c97540e3fb4e161e1894