[dali_1.1.33] Merge branch 'devel/master' 80/68580/1
authorDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:47:52 +0000 (15:47 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:47:52 +0000 (15:47 +0100)
Change-Id: Iab046a082b3b5fa488b57438f6b3a7ab12e98799


Trivial merge