[dali_1.1.32] Merge branch 'devel/master' 29/67929/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 29 Apr 2016 08:11:11 +0000 (09:11 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 29 Apr 2016 08:11:11 +0000 (09:11 +0100)
Change-Id: I9970393382b7900ebc30fc3185a442b1d584a828


Trivial merge