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


Trivial merge