Merge remote-tracking branch 'origin/tizen' into new_text 13/36313/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 4 Mar 2015 19:25:19 +0000 (19:25 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 4 Mar 2015 19:26:16 +0000 (19:26 +0000)
Change-Id: I33e5df93b492f44adf18e4d605ffb155c14ac024


Trivial merge