From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 2 Jun 2011 16:46:11 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: 1.19.3~505^2~993
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13c252b2a8ffbe31ffb310ec82cb08609e5a781a;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

Conflicts:
	configure.ac
---

13c252b2a8ffbe31ffb310ec82cb08609e5a781a