Merge branch 'tizen' into cynara 35/30735/1
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 24 Nov 2014 17:44:39 +0000 (18:44 +0100)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 24 Nov 2014 17:44:47 +0000 (18:44 +0100)
Change-Id: I4914064a6a5e309decea74043195e91424cb9141


Trivial merge