[Vm-dev] Differences between olpc and trunk branches