ben
committed
on 21 Jan 02
fixed small conflicts