Merge branch 'tizen' into cynara 91/35491/1
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 16 Feb 2015 13:24:04 +0000 (14:24 +0100)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 16 Feb 2015 13:24:40 +0000 (14:24 +0100)
Change-Id: I52bb94b85304e141e2462067d8c8dae80fe53081


Trivial merge