Merge branch 'devel/upgrade' into tizen 44/19744/1 accepted/tizen/mobile/20140519.082802 submit/tizen/20140417.073530
authorBoram Park <boram1288.park@samsung.com>
Thu, 17 Apr 2014 07:21:53 +0000 (16:21 +0900)
committerBoram Park <boram1288.park@samsung.com>
Thu, 17 Apr 2014 07:22:39 +0000 (16:22 +0900)
Change-Id: I2113d783ae1388e39b6243d583cc71699603e84f
Signed-off-by: Boram Park <boram1288.park@samsung.com>

Trivial merge