miguelm
committed
on 30 Nov 05
merge with HEAD