From: Reid Kleckner <reid@kleckner.net>
Date: Mon, 14 Mar 2011 16:15:42 +0000 (-0400)
Subject: Merge with default.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3eb2347c8ce29ac76de4c2e4f98c6ecfa3b69e01;p=python

Merge with default.
---

3eb2347c8ce29ac76de4c2e4f98c6ecfa3b69e01