[dali_1.1.23] Merge branch 'devel/master' 99/60499/1
authorDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2016 13:46:09 +0000 (13:46 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2016 13:46:09 +0000 (13:46 +0000)
Change-Id: Ifef58b4bfd9e96941f2cc61f1491d127bd438835


Trivial merge