maltes
committed
on 28 Oct 05
Merging changes