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


Trivial merge