Checkout
Alex
committed
on 02 May 07
fixes in RC related to incorrect merge