Wixed ggc's warning
Merge branch 'master' into tizen2