[dali_1.0.48] Merge branch 'devel/master' 96/43496/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 9 Jul 2015 14:11:27 +0000 (15:11 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 9 Jul 2015 14:14:15 +0000 (15:14 +0100)
Change-Id: I1f38811b16d5689c736343aee9b947fb7d5162ea


Trivial merge