rebase oob-dextrose4 to olpc's v7.0