[dali_1.1.40] Merge branch 'devel/master' 59/76559/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:53:34 +0000 (08:53 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:54:10 +0000 (08:54 +0100)
Change-Id: Ib300a2a65815251cbfcaf84c3c1fc151064d9d8f


Trivial merge