[dali_1.2.7] Merge branch 'devel/master' 48/89448/1
authorDavid Steele <david.steele@partner.samsung.com>
Fri, 23 Sep 2016 12:57:56 +0000 (13:57 +0100)
committerDavid Steele <david.steele@partner.samsung.com>
Fri, 23 Sep 2016 12:57:56 +0000 (13:57 +0100)
Change-Id: I72355ee06874e8a7127591c9246e57141c8f8794


Trivial merge