From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Fri, 20 May 2011 10:26:57 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: RELEASE-0.11.0~255
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9b134d1a94584bbaf9ea06a46b3271f9486d529;p=platform%2Fupstream%2Fgst-plugins-base.git

Merge branch 'master' into 0.11

Conflicts:
	docs/plugins/gst-plugins-base-plugins.hierarchy
	docs/plugins/gst-plugins-base-plugins.interfaces
	docs/plugins/gst-plugins-base-plugins.prerequisites
---

a9b134d1a94584bbaf9ea06a46b3271f9486d529