Merge branch 'tizen' into mw 11/23511/1
authorgreatim <jaewon81.lim@samsung.com>
Fri, 27 Jun 2014 02:46:19 +0000 (11:46 +0900)
committergreatim <jaewon81.lim@samsung.com>
Fri, 27 Jun 2014 02:46:21 +0000 (11:46 +0900)
Change-ID: I3808e88a0f9a0a54d76ac41424d80f8565597130


Trivial merge