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


Trivial merge