maltes
committed
on 24 May 06
Uncommitted changes by Timo