[Python-checkins] cpython (merge 3.1 -> 3.2): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/e3f807d52272
changeset:   69928:e3f807d52272
branch:      3.2
parent:      69927:a1158371956e
parent:      69926:7884783c9145
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat May 07 19:47:47 2011 +0200
summary:
  Merge

files:



-- 
Repository URL: http://hg.python.org/cpython