Merge "Merge branch 'devgfx' into tizen_2.1" into tizen_2.1