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