From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Thu, 8 Sep 2011 12:30:07 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: RELEASE-0.11.1~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97560eb9cb9629c90cca9c28bb4a4a2955c42227;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

Conflicts:
	gst/gstpad.c
---

97560eb9cb9629c90cca9c28bb4a4a2955c42227