From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Tue, 3 May 2011 07:41:48 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: RELEASE-0.11.0~422
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fe9bcd989cdfb4d540baab90cad32c5b4873752;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

Conflicts:
	configure.ac
	gst/gstbus.c
---

5fe9bcd989cdfb4d540baab90cad32c5b4873752