[dali_1.0.1] Merge branch 'tizen' 80/24980/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 14:02:41 +0000 (15:02 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 14:02:47 +0000 (15:02 +0100)
Change-Id: Ie2f5b19ff89393b738fe30db605451bf886b4e94


Trivial merge