From 3625d8367a054d52e28fc706f29cf40a5ca5cbd7 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 16 Feb 2012 14:33:20 +0100
Subject: [PATCH] Merge branch 'master' into 0.11

Conflicts:
	gst/mpegtsdemux/mpegtsbase.c
	gst/mpegtsdemux/mpegtspacketizer.c
	gst/mpegtsdemux/tsdemux.c
	gst/mve/gstmvedemux.c