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


Trivial merge