[dali_1.1.43] Merge branch 'devel/master' 64/80264/1
authorDavid Steele <david.steele@samsung.com>
Fri, 15 Jul 2016 11:27:49 +0000 (12:27 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 15 Jul 2016 11:27:49 +0000 (12:27 +0100)
Change-Id: Ia6bf3df38e96cadaebb5899363461c84dd9e5e6d


Trivial merge