[Python-checkins] (merge 3.2 -> 3.2): Merge heads.

[r.david.murray]

http://hg.python.org/cpython/rev/5fdb9f88be50
changeset:   68365:5fdb9f88be50
branch:      3.2
parent:      68361:de5d0b4f81c3
parent:      68358:8a4c4f269156
user:        R David Murray <rdmurray at bitdance.com>
date:        Thu Mar 10 18:15:25 2011 -0500
summary:
  Merge heads.

files:
  


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