maltes
committed
on 14 Sep 05
Merged the two commits from Alex and Miguel into one...