]> granicus.if.org Git - python/commitdiff
Merged with hg.python.org.
authorReid Kleckner <reid@kleckner.net>
Wed, 16 Mar 2011 21:09:41 +0000 (17:09 -0400)
committerReid Kleckner <reid@kleckner.net>
Wed, 16 Mar 2011 21:09:41 +0000 (17:09 -0400)

Trivial merge