[dali_1.0.2] Merge branch 'tizen' 08/25308/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:16:39 +0000 (16:16 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:16:49 +0000 (16:16 +0100)
Change-Id: Ib3be166e07ab411da4f3b339ba83467a15df4078


Trivial merge