timoh
committed
on 11 Feb 04
moved for better naming