From: Nick Holland <nick.holland@partner.samsung.com>
Date: Wed, 27 Aug 2014 16:29:09 +0000 (+0100)
Subject: [dali_1.0.6] Merge branch 'tizen'
X-Git-Tag: dali_1.0.7~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=1721bf9865a0aab37d03c46dba8c2f63c24593bb

[dali_1.0.6] Merge branch 'tizen'

Change-Id: Id69c5d62ff17fae60f2e4e10e993efbf4cda24ba
---

1721bf9865a0aab37d03c46dba8c2f63c24593bb