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


Trivial merge