[dali_1.0.15] Merge branch 'tizen' 11/29611/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 30 Oct 2014 10:13:30 +0000 (10:13 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 30 Oct 2014 10:14:07 +0000 (10:14 +0000)
Change-Id: I4287577d2f081f10672b46fb6fe965318914490d


Trivial merge