Merge branch 'devel/upgrade' into tizen 01/19701/1 accepted/tizen/mobile/20140519.074853 submit/tizen/20140417.073530
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:28 +0000 (14:46 +0900)
Change-Id: I1346f5212bf0dc140404143482ddf0ca7e41c6e0
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>

Trivial merge