[dali_1.0.2] Merge branch 'tizen' 06/25306/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:02:09 +0000 (16:02 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:02:13 +0000 (16:02 +0100)
Change-Id: I9d0dc43de965f34f42dbcfcbc0e332609c07e7cd


Trivial merge