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

[jesus.cea]

http://hg.python.org/cpython/rev/b153c341e6ef
changeset:   68584:b153c341e6ef
parent:      68583:45f100e627f0
parent:      68581:9a817ab166e0
user:        Jesus Cea <jcea at jcea.es>
date:        Wed Mar 16 02:35:37 2011 +0100
summary:
  Dummy merge

files:
  


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