[dali_1.1.23] Merge branch 'devel/master' 98/60498/1
authorDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2016 13:45:59 +0000 (13:45 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2016 13:45:59 +0000 (13:45 +0000)
Change-Id: I5fdd5a67e74712631beded9184b0b6aabdb75709


Trivial merge