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

[antoine.pitrou]

http://hg.python.org/cpython/rev/3d5e0d123838
changeset:   68833:3d5e0d123838
parent:      68832:aa9e88e4586a
parent:      68830:8b633c55ac7a
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Mar 22 18:34:21 2011 +0100
summary:
  Merge

files:
  


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