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


Trivial merge