Merge branch 'tizen' into security-manager 36/30736/1
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 24 Nov 2014 17:45:55 +0000 (18:45 +0100)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 24 Nov 2014 17:47:10 +0000 (18:47 +0100)
Change-Id: Ia942a66c32828236c55e16871ce82ffa1aed95a5


Trivial merge