gst-plugins-good: Merge branch '0.10'

[Stefan Kost]

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

Author: Stefan Sauer <ensonic at users.sf.net>
Date:   Mon Apr  2 23:18:00 2012 +0200

Merge branch '0.10'

Conflicts:
	gst/matroska/matroska-demux.c
	gst/matroska/matroska-mux.c
	gst/matroska/matroska-read-common.c
	gst/matroska/matroska-read-common.h

---