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

[brian.curtin]

http://hg.python.org/cpython/rev/5062b5286eba
changeset:   69262:5062b5286eba
parent:      69259:2c4043070f05
parent:      69261:b166c972cb5e
user:        Brian Curtin <brian at python.org>
date:        Mon Apr 11 18:36:59 2011 -0500
summary:
  Dummy merge

files:



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