miguelm
committed
on 30 Nov 05
commit changes of merge with HEAD