From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Fri, 6 Apr 2012 12:52:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/0.10'
X-Git-Tag: 1.10.4~478^2~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d744d7027aaf5f3115a6ecdd2a31a67b58daecc;p=platform%2Fupstream%2Fgst-plugins-base.git

Merge remote-tracking branch 'origin/0.10'

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