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


Trivial merge