Merge branch 'tizen' into new_text 93/32393/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 17 Dec 2014 15:42:44 +0000 (15:42 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 17 Dec 2014 15:44:12 +0000 (15:44 +0000)
Change-Id: I5e353b151f78237a7bed4706c24b8d93b7b341f4


Trivial merge