Merge branch 'tizen' into mw
authorj0kim <j0.kim@samsung.com>
Tue, 17 Jun 2014 07:16:07 +0000 (16:16 +0900)
committerj0kim <j0.kim@samsung.com>
Tue, 17 Jun 2014 07:16:07 +0000 (16:16 +0900)

Trivial merge