[Python-checkins] cpython (merge 2.6 -> 2.7): Dummy merge from 2.6.

[r.david.murray]

http://hg.python.org/cpython/rev/5e7fc2a42c3c
changeset:   69080:5e7fc2a42c3c
branch:      2.7
parent:      69058:f4e6e18cae4b
parent:      69056:202078f2856f
user:        R David Murray <rdmurray at bitdance.com>
date:        Thu Mar 31 11:48:31 2011 -0400
summary:
  Dummy merge from 2.6.

files:



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