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

[kurt.kaiser]

http://hg.python.org/cpython/rev/9c0838f2f86c
changeset:   68920:9c0838f2f86c
parent:      68916:ffa5be46c6a5
parent:      68919:c5b47a746a7f
user:        Kurt B. Kaiser <kbk at shore.net>
date:        Fri Mar 25 00:32:23 2011 -0400
summary:
  Merge from 3.2 again

files:



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