Merge branch 'tizen' into devel/new_mesh 33/40733/1
authorFrancisco Santos <f1.santos@samsung.com>
Thu, 4 Jun 2015 16:31:19 +0000 (17:31 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 8 Jun 2015 12:11:02 +0000 (13:11 +0100)
Change-Id: I38c536fc0ba528d76aefd1809b76aac840f291ed


Trivial merge