Merge "Fix prevent issues" into devel/master

author Adeel Kazmi <adeel.kazmi@samsung.com>

Fri, 28 Aug 2015 17:24:20 +0000 (10:24 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Fri, 28 Aug 2015 17:24:20 +0000 (10:24 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Aug 2015 17:24:20 +0000 (10:24 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 28 Aug 2015 17:24:20 +0000 (10:24 -0700)
diff --cc dali-toolkit/internal/text/text-controller-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Fri, 28 Aug 2015 17:24:20 +0000 (10:24 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 28 Aug 2015 17:24:20 +0000 (10:24 -0700)