[dali_1.0.39] Merge branch 'tizen' 45/38645/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 23 Apr 2015 11:04:43 +0000 (12:04 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 23 Apr 2015 11:04:43 +0000 (12:04 +0100)
Change-Id: I4172357534594f15d1ebed4ef2e01e253dfc28a5


Trivial merge