[dali_1.1.4] Merge branch 'devel/master' 15/48715/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:20 +0000 (08:46 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:20 +0000 (08:46 +0100)
Change-Id: I10c5967ddf6820698bbd18260cfa08fc3d2f7bee


Trivial merge