From: Brian Quinlan <brian@sweetapp.com>
Date: Thu, 7 Apr 2011 22:30:41 +0000 (+1000)
Subject: Merge to tip.
X-Git-Tag: v3.3.0a1~2649
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d08b330a1538132737d9de646a53dd9dae581d57;p=python

Merge to tip.
---

d08b330a1538132737d9de646a53dd9dae581d57