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


Trivial merge