Merge branch 'tizen' into mw 78/23178/1
authorseokgil.kang <seokgil.kang@samsung.com>
Thu, 19 Jun 2014 02:13:27 +0000 (11:13 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Thu, 19 Jun 2014 02:16:02 +0000 (11:16 +0900)
Change-Id: Ibe239b17566d9d027c6405c7a9dea17727071bf6
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>

Trivial merge