Merge branch 'tizen' into mw 11/22911/1
authorseokgil.kang <seokgil.kang@samsung.com>
Fri, 13 Jun 2014 08:03:43 +0000 (17:03 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Fri, 13 Jun 2014 08:04:36 +0000 (17:04 +0900)
Change-Id: I31b82ffc90291a43ee3b4537a22cf833934e582c
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>

Trivial merge