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

Trivial merge