[dali_1.1.3] Merge branch 'devel/master' 54/48354/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:36 +0000 (11:03 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:36 +0000 (11:03 +0100)
Change-Id: I88dd0c88db9259ad8f73c06e6f51c3a29b690cc2


Trivial merge