[dali_1.0.45] Merge branch 'devel/master' 62/41862/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:14:47 +0000 (12:14 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:14:47 +0000 (12:14 +0100)
Change-Id: Ia30f7e9c898c6137274819c0011e9783f635532e


Trivial merge