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

Wed Jan 25 03:29:21 PST 2012

Module: gst-plugins-base
Branch: 0.11
Commit: 130a8335a068ff769fcfdbe827a958feda18b141
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=130a8335a068ff769fcfdbe827a958feda18b141

Author: Sebastian DrÃ¶ge <sebastian.droege at collabora.co.uk>
Date:   Wed Jan 25 12:29:11 2012 +0100

Merge branch 'master' into 0.11

Conflicts:
	gst/playback/gstdecodebin2.c

---