[dali_1.1.42] Merge branch 'devel/master' 05/79205/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:44:08 +0000 (17:44 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:44:08 +0000 (17:44 +0100)
Change-Id: I7f23a8bf3eb1db0acdd16c4cb1f688a19fe88719


Trivial merge