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


Trivial merge