Merge branch 'new_text' into tizen 29/38029/1
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 16:02:35 +0000 (17:02 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 16:03:28 +0000 (17:03 +0100)
Change-Id: Iff4a8ad638aa654b016d49a1dc07a602618f64be


Trivial merge