Richard Opalka
committed
on 19 Jun 08
sync spi trunk with QA branch