From: Paul Wisbey <p.wisbey@samsung.com>
Date: Wed, 17 Dec 2014 14:30:30 +0000 (+0000)
Subject: Merge branch 'tizen' into new_text
X-Git-Tag: new_text_0.1~66
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=b8c93847cc736bfc69876fd087ab06474fbfbe47

Merge branch 'tizen' into new_text

Change-Id: I56c3eea20ba2a50052d63ca4b221fe6dd6183d1f
---

b8c93847cc736bfc69876fd087ab06474fbfbe47