Merge branch 'asus-eeepc' into release