[dali_1.0.28] Merge branch 'tizen' 59/35059/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 6 Feb 2015 11:51:32 +0000 (11:51 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 6 Feb 2015 11:51:32 +0000 (11:51 +0000)
Change-Id: I95684fb11edfce59fedb9524b667ee7e3edc507b


Trivial merge