gustafn
committed
on 31 Jul 06
merged version from cvs 5-2, conflicts resolved (2x white space, 1x .info file)