Merge branch 'tizen' into mw
authorgreatim <jaewon81.lim@samsung.com>
Tue, 16 Sep 2014 12:02:44 +0000 (21:02 +0900)
committergreatim <jaewon81.lim@samsung.com>
Tue, 16 Sep 2014 12:02:47 +0000 (21:02 +0900)
Change-ID: I81d148d92077d28d1c83c2a2aaf67af0268ce41b


Trivial merge