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

[kurt.kaiser]

http://hg.python.org/cpython/rev/c5b47a746a7f
changeset:   68919:c5b47a746a7f
branch:      3.2
parent:      68915:6c421c24c183
parent:      68918:503be06d110b
user:        Kurt B. Kaiser <kbk at shore.net>
date:        Fri Mar 25 00:30:40 2011 -0400
summary:
  Merge from 3.1 again

files:



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