From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 28 Apr 2011 17:28:16 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: RELEASE-0.11.0~344
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a1f60ed9ca8a5e890dd3fa0d4ab427a207bf418;p=platform%2Fupstream%2Fgst-plugins-base.git

Merge branch 'master' into 0.11

Conflicts:
	configure.ac
---

7a1f60ed9ca8a5e890dd3fa0d4ab427a207bf418