From: Sungyeon Woo <s.woo@samsung.com>
Date: Tue, 7 May 2013 13:58:14 +0000 (+0900)
Subject: Merge branch 'tizen_2.1' into devgfx
X-Git-Tag: submit/tizen_2.2/20130714.153149~277^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fed071fc1caba81462e4f6a700df933e471dab12;p=framework%2Fosp%2Fuifw.git

Merge branch 'tizen_2.1' into devgfx

Conflicts:
	src/graphics/FGrp_Canvas.cpp

Change-Id: I33dd8159c19901e795e28b4ef597b688e5465c77
---

fed071fc1caba81462e4f6a700df933e471dab12