Merge branch 'samsung-fixes' into samsung-next-base
authorTomasz Figa <t.figa@samsung.com>
Mon, 30 Dec 2013 17:15:23 +0000 (18:15 +0100)
committerTomasz Figa <t.figa@samsung.com>
Mon, 30 Dec 2013 17:15:23 +0000 (18:15 +0100)

Trivial merge