From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 28 Oct 2011 14:27:43 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: RELEASE-0.11.2~563
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e8cf7fee7cbe953bb394de6e40fc1715d78cb43;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

Conflicts:
	libs/gst/base/gstbasetransform.c
---

5e8cf7fee7cbe953bb394de6e40fc1715d78cb43