matthewg
committed
on 18 Jun 06
fixing some merge issues and verifying that the merge is allowed to take place