eduardop
committed
on 25 Oct 05
upgrade fixes