[dali_1.1.40] Merge branch 'devel/master' 55/76555/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:47:15 +0000 (08:47 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jun 2016 07:47:40 +0000 (08:47 +0100)
Change-Id: I9752c3dd14f0266c08927c29efd1c4ceffd67d2e


Trivial merge