Merge "Fixes for text layout." into devel/master
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 11 Jun 2015 14:57:38 +0000 (07:57 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 11 Jun 2015 14:57:38 +0000 (07:57 -0700)

Trivial merge