Merge branch 'devel/upgrade' into tizen 04/19704/1 devel/x11 accepted/tizen/mobile/20140519.082818 submit/devel/x11/20140718.035926 submit/tizen/20140417.073530 submit/tizen/20140818.084211 submit/tizen/20140818.144456 submit/tizen/20140819.234625
authorChangyeon Lee <cyeon.lee@samsung.com>
Thu, 17 Apr 2014 05:39:54 +0000 (14:39 +0900)
committerChangyeon Lee <cyeon.lee@samsung.com>
Thu, 17 Apr 2014 05:46:30 +0000 (14:46 +0900)
Change-Id: Ia719dd4b51b812eb74551325ba353aac2a1274d1
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>

Trivial merge