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


Trivial merge