[dali_1.1.42] Merge branch 'devel/master' 04/79204/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:43:58 +0000 (17:43 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:43:58 +0000 (17:43 +0100)
Change-Id: I41afa4c2e8e5cae0c455681f197e5088c4bb8970


Trivial merge