]> granicus.if.org Git - python/commitdiff
Merge with default.
authorReid Kleckner <reid@kleckner.net>
Mon, 14 Mar 2011 16:12:18 +0000 (12:12 -0400)
committerReid Kleckner <reid@kleckner.net>
Mon, 14 Mar 2011 16:12:18 +0000 (12:12 -0400)

Trivial merge