Merge branch 'x86/olpc'