Merge "Text clean." into devel/master

author Paul Wisbey <p.wisbey@samsung.com>

Tue, 28 Jul 2015 14:42:02 +0000 (07:42 -0700)

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

Tue, 28 Jul 2015 14:42:02 +0000 (07:42 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Tue, 28 Jul 2015 14:42:02 +0000 (07:42 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 28 Jul 2015 14:42:02 +0000 (07:42 -0700)
diff --cc dali-toolkit/internal/text/layouts/layout-engine.cpp
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Tue, 28 Jul 2015 14:42:02 +0000 (07:42 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 28 Jul 2015 14:42:02 +0000 (07:42 -0700)