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


Trivial merge