Merge branch 'eeepc' into test