]> granicus.if.org Git - python/commitdiff
#2650: Merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 25 Mar 2011 12:26:56 +0000 (14:26 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 25 Mar 2011 12:26:56 +0000 (14:26 +0200)

Trivial merge