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


Trivial merge