From: Paul Wisbey <p.wisbey@samsung.com>
Date: Mon, 9 Feb 2015 18:29:37 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: new_text_0.1~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d59e156051bffbef9e31abbb217a929427017f72;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: I18093fe9a0e8e429074f36e5fff26de207940c3f
---

d59e156051bffbef9e31abbb217a929427017f72