[dali_1.0.53] Merge branch 'devel/master' 24/45924/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 12 Aug 2015 09:51:18 +0000 (10:51 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 12 Aug 2015 09:51:18 +0000 (10:51 +0100)
Change-Id: I1a5ec034964cc78f16af74ccba13bdff5561f0af


Trivial merge