[dali_1.0.48] Merge branch 'devel/master' 97/43497/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 9 Jul 2015 14:12:07 +0000 (15:12 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 9 Jul 2015 14:14:59 +0000 (15:14 +0100)
Change-Id: I2ac98c2a051016180e16bd97eb5cf98d52754f85


Trivial merge