miguelm
committed
on 13 Jun 05
merging changes with HEAD