From: Paul Wisbey <p.wisbey@samsung.com>
Date: Mon, 26 Jan 2015 09:08:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: new_text_0.1~63
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=refs%2Fchanges%2F77%2F34377%2F1

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

Change-Id: I22c07acab710d400f7103df9be66c622f38f3cad
---

a2cf5defe3e8e41bad76c68246c6a13bef373d83