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


Trivial merge