Merge branch 'tizen' into ckm 73/30973/1
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Thu, 27 Nov 2014 17:47:10 +0000 (18:47 +0100)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Thu, 27 Nov 2014 17:47:16 +0000 (18:47 +0100)
Change-Id: I1d9bf221dc53b1f41056ca81ffa399cb494f9c78


Trivial merge