Merge branch 'devel/upgrade' into tizen 43/19743/1 accepted/tizen/mobile/20140519.082841 submit/devel/x11/20140718.035926 submit/tizen/20140417.073530
authorBoram Park <boram1288.park@samsung.com>
Thu, 17 Apr 2014 07:19:39 +0000 (16:19 +0900)
committerBoram Park <boram1288.park@samsung.com>
Thu, 17 Apr 2014 07:20:05 +0000 (16:20 +0900)
Change-Id: I4acd36f44fa3905fa3d3d641fd3a9cad0b40e95e
Signed-off-by: Boram Park <boram1288.park@samsung.com>

Trivial merge