From: Thibault Saunier <thibault.saunier@collabora.com>
Date: Mon, 2 Jul 2012 00:54:42 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/0.10'
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7eed7ef46cabe46da2a629f0e8d329dca52d80e2;p=platform%2Fupstream%2Fgst-editing-services.git

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	common
---

7eed7ef46cabe46da2a629f0e8d329dca52d80e2