From: Paul Wisbey <p.wisbey@samsung.com>
Date: Thu, 9 Apr 2015 16:55:24 +0000 (+0100)
Subject: Merge branch 'new_text' into tizen
X-Git-Tag: dali_1.0.38~11
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7aa9e3d716396348b89c913b306bbc1ce201db69;hp=7aa9e3d716396348b89c913b306bbc1ce201db69

Merge branch 'new_text' into tizen

Change-Id: Iecbf9000e282e0eda6240c4895f9d25a1bbb6c41
---