From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Fri, 2 Dec 2011 02:01:06 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into 0.11
X-Git-Tag: 1.19.3~505^2~902
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7bd9400ff1331ac95ccf84c84b19a057d2946bf2;p=platform%2Fupstream%2Fgstreamer.git

Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
	ext/dvdread/dvdreadsrc.c
---

7bd9400ff1331ac95ccf84c84b19a057d2946bf2