Merge branch 'tizen' into new_text 99/32599/1
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 19 Dec 2014 10:02:41 +0000 (10:02 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 19 Dec 2014 10:03:21 +0000 (10:03 +0000)
Change-Id: I465251a37a21be084091c48dbf0b1b4b94ccceaf


Trivial merge