maltes
committed
on 30 Apr 05
Reverting changes from Timo