[dali_1.1.43] Merge branch 'devel/master' 65/80265/1
authorDavid Steele <david.steele@samsung.com>
Fri, 15 Jul 2016 11:28:01 +0000 (12:28 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 15 Jul 2016 11:28:02 +0000 (12:28 +0100)
Change-Id: Ib9cb3fa0a9efdd506ddce86805dce89755846d57


Trivial merge