From: Paul Wisbey <p.wisbey@samsung.com>
Date: Wed, 7 Jan 2015 10:11:05 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: new_text_0.1~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F33254%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

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

Change-Id: I4cd9e02dda715ea1c7c6bcc19c54de5bd17fdb43
---

7e713f282f426401e7f7d0a6ccc9f7ebcccfff1c