victorg
committed
on 09 Jun 06
Removing ">>>>>>" ( signs from the merge between oacs-5-2 and HEAD maybe ).