Merge branch 'devel/new_mesh' into devel/master 84/42384/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:18:45 +0000 (15:18 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:19:22 +0000 (15:19 +0100)
Change-Id: I491fcf5f6663e8de6bba090279d3f35420453129


Trivial merge