From: Changyeon Lee <cyeon.lee@samsung.com>
Date: Wed, 9 Apr 2014 02:14:48 +0000 (+0900)
Subject: Merge branch 'upstream' into tizen
X-Git-Tag: submit/devel/upgrade/20140410.014603~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2FlibXres.git;a=commitdiff_plain;h=159e9e0ef78607329900f12a5e19cf63588d7ce5

Merge branch 'upstream' into tizen
---

159e9e0ef78607329900f12a5e19cf63588d7ce5