[dali_1.1.40] Merge branch 'devel/master' 57/76557/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:51:18 +0000 (08:51 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:53:04 +0000 (08:53 +0100)
Change-Id: I8597bf4b7fda1590b350a530d7f91fcd9a72faee


Trivial merge