[dali_1.1.22] Merge branch 'devel/master' 23/59923/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:53:02 +0000 (10:53 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:53:02 +0000 (10:53 +0000)
Change-Id: I2c9e07e5d24e343898792da6fe6ecab35c6597af


Trivial merge