[dali_1.0.2] Merge branch 'tizen' 04/25304/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 14:55:50 +0000 (15:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 14:56:24 +0000 (15:56 +0100)
Change-Id: Ieb7d236ac692d7a571a3572aa1c2a314412273d3


Trivial merge