]> granicus.if.org Git - python/commitdiff
Merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Wed, 16 Mar 2011 10:52:57 +0000 (12:52 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Wed, 16 Mar 2011 10:52:57 +0000 (12:52 +0200)

Trivial merge