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

[kurt.kaiser]

http://hg.python.org/cpython/rev/ffa5be46c6a5
changeset:   68916:ffa5be46c6a5
parent:      68914:909c11cd3d85
parent:      68915:6c421c24c183
user:        Kurt B. Kaiser <kbk at shore.net>
date:        Fri Mar 25 00:26:11 2011 -0400
summary:
  Merge from 3.2 again

files:



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