rmello
committed
on 25 Jul 02
Integrated changes (recolving conflicts)