merged vaio+mac changes