From: Changyeon Lee <cyeon.lee@samsung.com>
Date: Thu, 17 Apr 2014 05:39:57 +0000 (+0900)
Subject: Merge branch 'devel/upgrade' into tizen
X-Git-Tag: accepted/tizen/mobile/20140519.081633^0
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2FlibXres.git;a=commitdiff_plain;h=HEAD

Merge branch 'devel/upgrade' into tizen

Change-Id: I2a402b0ef9f48a7ab71dfe8e34fd145e3d11de48
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>
---

540ed6e5a7213f0a771a8404301ca3f48ba7433c