jeffd
committed
on 21 Jan 05
remove duped provides/requires from merge