[dali_1.1.22] Merge branch 'devel/master' 22/59922/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:52:56 +0000 (10:52 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:52:56 +0000 (10:52 +0000)
Change-Id: I02f523742c661c1b46c57a3dbfc1fd482a27d096


Trivial merge