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

Merge branch 'master' into 0.11

Conflicts:
	configure.ac
---

c3b778f9b1df334ee81c582930fda13246684d23