Merge branch 'devel/new_mesh' into devel/master 85/42385/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:23:23 +0000 (15:23 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:24:56 +0000 (15:24 +0100)
Change-Id: I4e6bc90b0175f34392a59dca76abc7fe5f6dd929


Trivial merge