eduardop
committed
on 11 Feb 05
removing some breakage that should be tested before commit