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


Trivial merge