Merge branch 'devel/upgrade' into tizen 05/19705/1 accepted/tizen/mobile/20140519.083812 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:30 +0000 (14:46 +0900)
Change-Id: I9c40b2d8b4d36dc8a7c2c55af7863925e655af06
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>

Trivial merge