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

[antoine.pitrou]

http://hg.python.org/cpython/rev/6aea90327020
changeset:   69930:6aea90327020
parent:      69929:40fa46249611
parent:      69928:e3f807d52272
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat May 07 19:48:40 2011 +0200
summary:
  Merge

files:



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