[dali_1.1.10] Merge branch 'devel/master' 76/51776/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 13 Nov 2015 16:34:29 +0000 (16:34 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 13 Nov 2015 16:34:29 +0000 (16:34 +0000)
Change-Id: If2984f6a1a387ea654c7a427d6fc64dd353c11ad


Trivial merge