[0.11] gst-plugins-good: Merge branch 'master' into 0.11

[Wim Taymans]

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

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Tue Feb 14 10:51:38 2012 +0100

Merge branch 'master' into 0.11

Conflicts:
	tests/check/elements/flacparse.c

---