From: Changyeon Lee <cyeon.lee@samsung.com>
Date: Thu, 17 Apr 2014 05:39:58 +0000 (+0900)
Subject: Merge branch 'devel/upgrade' into tizen
X-Git-Tag: submit/devel/x11/20140718.035926
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Fdevel%2Fx11%2F20140718.035926;p=platform%2Fupstream%2Fxinit.git

Merge branch 'devel/upgrade' into tizen

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

ba6c5bef58d88aab1584107543b81a2930451a1f