Merge "Stop doing unparent and reset in text decorator." into devel/master
authorPaul Wisbey <p.wisbey@samsung.com>
Mon, 6 Jul 2015 15:45:47 +0000 (08:45 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 6 Jul 2015 15:45:47 +0000 (08:45 -0700)

Trivial merge