timoh
committed
on 29 Apr 05
merge with 5-1 code