Merge branch 'mw' into tizen 13/23513/1
authorseokgil.kang <seokgil.kang@samsung.com>
Fri, 27 Jun 2014 03:06:07 +0000 (12:06 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Fri, 27 Jun 2014 03:06:20 +0000 (12:06 +0900)
Change-Id: Ic441b6f9f0566b13b968dc6d9d1c057c20ee0b97
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>

Trivial merge