From 4d744d7027aaf5f3115a6ecdd2a31a67b58daecc Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Fri, 6 Apr 2012 14:52:12 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/0.10'

Conflicts:
	gst/h264parse/gsth264parse.c
	gst/videoparsers/gsth264parse.c