gustafn
committed
on 18 Jun 08
merge in recent fixes from head