Merge branch 'eeepc-laptop' into release