Merge branch 'tizen_2.1' into devgfx

Conflicts:
	src/graphics/FGrp_Canvas.cpp

Change-Id: I33dd8159c19901e795e28b4ef597b688e5465c77

diff --cc src/graphics/FGrp_BitmapImpl.cpp
Simple merge

diff --cc src/graphics/FGrp_CanvasPixman.cpp
Simple merge

diff --cc src/graphics/FGrp_CanvasPixman.h
Simple merge

diff --cc src/graphics/text/FGrp_TextTextSimple.cpp
Simple merge