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

Merge branch 'devel/upgrade' into tizen

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

e8ff70cb223261684ed4fd210c56062aee905e41