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


Trivial merge