From: Mike McCormack <mj.mccormack@samsung.com>
Date: Tue, 2 Aug 2011 09:25:03 +0000 (+0900)
Subject: Merge branch 'upstream'
X-Git-Tag: submit/2.0alpha-wayland/20121130.004132~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7ba29a6b4e8d415735c42c85400cdbdf1e81da5;p=profile%2Fivi%2Forg.tizen.video-player.git

Merge branch 'upstream'
---

f7ba29a6b4e8d415735c42c85400cdbdf1e81da5