From: Kingsley Stephens <k.stephens@partner.samsung.com>
Date: Wed, 13 Aug 2014 14:21:06 +0000 (+0100)
Subject: [dali_1.0.4] Merge branch 'tizen'
X-Git-Tag: dali_1.0.7~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=deacfdccd61c675e6e338628ac4c7095d8ba6cdf

[dali_1.0.4] Merge branch 'tizen'

Change-Id: Iafb7547de8e8958195153b25af11fee9e4fec54a
---

deacfdccd61c675e6e338628ac4c7095d8ba6cdf