gst-plugins-good: Merge remote-tracking branch 'origin/0.10'

[Mark Nauwelaerts]

Module: gst-plugins-good
Branch: master
Commit: ea397f60e437a528a499288a4bdffbc626031deb
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=ea397f60e437a528a499288a4bdffbc626031deb

Author: Mark Nauwelaerts <mark.nauwelaerts at collabora.co.uk>
Date:   Tue Apr 10 11:57:53 2012 +0200

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	gst/flv/gstflvdemux.c
	gst/matroska/matroska-demux.c

---