Merge branch 'devel/upgrade' into tizen 27/19727/1 devel/x11 tizen accepted/tizen/mobile/20140519.074942 submit/devel/x11/20140718.035926 submit/tizen/20140417.073530
authorChangyeon Lee <cyeon.lee@samsung.com>
Thu, 17 Apr 2014 05:39:58 +0000 (14:39 +0900)
committerChangyeon Lee <cyeon.lee@samsung.com>
Thu, 17 Apr 2014 05:46:41 +0000 (14:46 +0900)
Change-Id: I9be57ffaf7d56f74ce4f1954fe97335cc5d438ed
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>

Trivial merge