[dali_1.0.2] Merge branch 'tizen' 10/25310/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:21:44 +0000 (16:21 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:21:50 +0000 (16:21 +0100)
Change-Id: Ic01382971a3209f8cfabc035225789a0d984715d


Trivial merge